diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,7 @@ - - - - - - - - - - + @@ -135,7 +114,9 @@ - + - + + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,7 @@ - - - - - - - - - - + @@ -135,7 +114,9 @@ - + - + - + android:textSize="@dimen/textFontSize" /> + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,7 @@ - - - - - - - - - - + @@ -135,7 +114,9 @@ - + - + - + android:textSize="@dimen/textFontSize" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,7 @@ - - - - - - - - - - + @@ -135,7 +114,9 @@ - + - + - + android:textSize="@dimen/textFontSize" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_check.xml b/app/src/main/res/layout/item_case_check.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_check.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,7 @@ - - - - - - - - - - + @@ -135,7 +114,9 @@ - + - + - + android:textSize="@dimen/textFontSize" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_check.xml b/app/src/main/res/layout/item_case_check.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_check.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_handle.xml b/app/src/main/res/layout/item_case_handle.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_handle.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,7 @@ - - - - - - - - - - + @@ -135,7 +114,9 @@ - + - + - + android:textSize="@dimen/textFontSize" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_check.xml b/app/src/main/res/layout/item_case_check.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_check.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_handle.xml b/app/src/main/res/layout/item_case_handle.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_handle.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_overtime.xml b/app/src/main/res/layout/item_case_overtime.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_overtime.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,7 @@ - - - - - - - - - - + @@ -135,7 +114,9 @@ - + - + - + android:textSize="@dimen/textFontSize" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_check.xml b/app/src/main/res/layout/item_case_check.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_check.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_handle.xml b/app/src/main/res/layout/item_case_handle.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_handle.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_overtime.xml b/app/src/main/res/layout/item_case_overtime.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_overtime.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_process.xml b/app/src/main/res/layout/item_case_process.xml index 106ea95..a9b9c6c 100644 --- a/app/src/main/res/layout/item_case_process.xml +++ b/app/src/main/res/layout/item_case_process.xml @@ -79,7 +79,9 @@ android:textSize="@dimen/titleFontSize" /> - + + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,7 @@ - - - - - - - - - - + @@ -135,7 +114,9 @@ - + - + - + android:textSize="@dimen/textFontSize" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_check.xml b/app/src/main/res/layout/item_case_check.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_check.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_handle.xml b/app/src/main/res/layout/item_case_handle.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_handle.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_overtime.xml b/app/src/main/res/layout/item_case_overtime.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_overtime.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_process.xml b/app/src/main/res/layout/item_case_process.xml index 106ea95..a9b9c6c 100644 --- a/app/src/main/res/layout/item_case_process.xml +++ b/app/src/main/res/layout/item_case_process.xml @@ -79,7 +79,9 @@ android:textSize="@dimen/titleFontSize" /> - + + android:paddingHorizontal="@dimen/padding_10dp" + android:paddingVertical="5dp"> + android:textSize="24sp" /> - - + android:textColor="@color/black" + android:textSize="@dimen/textFontSize" /> - + android:layout_below="@id/caseTitleView" + android:layout_marginStart="@dimen/margin_10dp" + android:layout_marginTop="3dp" + android:layout_toEndOf="@id/v" + android:gravity="center" + android:singleLine="true" + android:text="发生地点：餐厅门口" + android:textColor="@color/textColor" /> + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,7 @@ - - - - - - - - - - + @@ -135,7 +114,9 @@ - + - + - + android:textSize="@dimen/textFontSize" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_check.xml b/app/src/main/res/layout/item_case_check.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_check.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_handle.xml b/app/src/main/res/layout/item_case_handle.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_handle.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_overtime.xml b/app/src/main/res/layout/item_case_overtime.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_overtime.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_process.xml b/app/src/main/res/layout/item_case_process.xml index 106ea95..a9b9c6c 100644 --- a/app/src/main/res/layout/item_case_process.xml +++ b/app/src/main/res/layout/item_case_process.xml @@ -79,7 +79,9 @@ android:textSize="@dimen/titleFontSize" /> - + + android:paddingHorizontal="@dimen/padding_10dp" + android:paddingVertical="5dp"> + android:textSize="24sp" /> - - + android:textColor="@color/black" + android:textSize="@dimen/textFontSize" /> - + android:layout_below="@id/caseTitleView" + android:layout_marginStart="@dimen/margin_10dp" + android:layout_marginTop="3dp" + android:layout_toEndOf="@id/v" + android:gravity="center" + android:singleLine="true" + android:text="发生地点：餐厅门口" + android:textColor="@color/textColor" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_urgent.xml b/app/src/main/res/layout/item_case_urgent.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_urgent.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1393d70..6e43017 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ + + 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 bc5846c..2a9fe67 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java index 1b77071..4f1d38b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_check, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseCheckedResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 e10fedc..4d1ecfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandleBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 1470dd7..6bec1b7 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_handle, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseHandledBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 553776a..64e7c92 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -63,24 +64,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(CaseListResultBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeName()); - contentView.setText(rowsBean.getCasetypeDetailName()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java index d3c36b2..a56fc77 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java @@ -1,6 +1,7 @@ package com.casic.dcms.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ @NonNull @Override public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifiedResultAdapter.ItemViewHolder(view); } @@ -52,21 +53,27 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + 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 index 5c01c92..32dbe3f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -1,6 +1,8 @@ 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; @@ -27,7 +29,7 @@ @NonNull @Override public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_verify, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new CaseVerifyResultAdapter.ItemViewHolder(view); } @@ -52,21 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + 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)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java deleted file mode 100644 index 26c2cce..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.luck.picture.lib.entity.LocalMedia; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageGridViewAdapter extends BaseAdapter { - - private static final String TAG = "ImageGridViewAdapter"; - private Context context; - private List mediaList = new ArrayList<>(); - private LayoutInflater inflater; - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - inflater = LayoutInflater.from(context); - } - - public void setMediaList(List selectList) { - mediaList.clear(); - if (selectList != null) { - mediaList.addAll(selectList); - } - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mediaList == null ? 0 : mediaList.size(); - } - - @Override - public Object getItem(int position) { - return mediaList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder itemViewHolder; - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_select_gridview, null); - itemViewHolder = new ItemViewHolder(); - itemViewHolder.imageView = convertView.findViewById(R.id.imageView); - itemViewHolder.deleteView = convertView.findViewById(R.id.deleteView); - convertView.setTag(itemViewHolder); - } else { - itemViewHolder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context).load(mediaList.get(position).getRealPath()).into(itemViewHolder.imageView); - if (clickListener != null) { - itemViewHolder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - private ImageView deleteView; - } - - private OnDeleteItemClickListener clickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.clickListener = deleteItemClickListener; - } -} 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 a9791a7..b13df60 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -28,7 +29,7 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_overtime, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @@ -53,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(OvertimeCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java index f06cec8..60d5e18 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -37,13 +37,6 @@ CaseProcessBean.DataBean dataBean = mProcessList.get(position); String typeName = dataBean.getOperationTypeName(); holder.operationTypeName.setText(typeName); -// if (position == 0) { -// holder.operationTypeName.setTextColor(ColorHelper.getResourcesColor(mContext, R.color.mainThemeColor)); -// } -// int itemViewType = holder.getItemViewType(); -// Log.d(TAG, "itemViewType: " + itemViewType); -// int adapterPosition = holder.getAdapterPosition(); -// Log.d(TAG, "adapterPosition: " + adapterPosition); holder.handlePersonView.setText(dataBean.getUserName()); holder.handleTimeView.setText(dataBean.getTime()); holder.handleResultView.setText(dataBean.getRemarks()); 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 b7f9ca3..505e219 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.bean.OvertimeCaseBean; import com.casic.dcms.bean.UrgentCaseBean; import java.util.List; @@ -29,7 +29,7 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_urgent, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @@ -54,24 +54,28 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { private TextView leftTextView; - private TextView titleView; - private TextView contentView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); leftTextView = itemView.findViewById(R.id.leftTextView); - titleView = itemView.findViewById(R.id.titleView); - contentView = itemView.findViewById(R.id.contentView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); } + @SuppressLint("SetTextI18n") void bindView(UrgentCaseBean.DataBean.RowsBean rowsBean) { String eorcName = rowsBean.getEorcName(); if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } leftTextView.setText(eorcName.substring(0, 1)); - titleView.setText(rowsBean.getCasetypeDetailName()); - contentView.setText(rowsBean.getDescription()); + caseTitleView.setText(rowsBean.getDescription()); + casePlaceView.setText("发生地点：" + rowsBean.getFieldintro()); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); } } diff --git a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java index 8360589..7f61617 100644 --- a/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PointFutureBean.java @@ -9,20 +9,22 @@ * bgid : 361024100011001 * chdate : * datasource : 实测 - * deptcode1 : 3610240016 - * deptcode2 : 3610240016 - * deptcode3 : 3610240016 - * deptname1 : 崇仁县公安局交警大队 - * deptname2 : 崇仁县公安局交警大队 - * deptname3 : 崇仁县公安局交警大队 + * deptcode1 : 3610240001 + * deptcode2 : 3610240013 + * deptcode3 : 3610240002 + * deptname1 : 崇仁县城管局 + * deptname2 : 崇仁县住建局 + * deptname3 : 崇仁县市政管理所 + * dl : 公用设施 * note : - * objectid : 1289 - * objid : 3610240212000144 - * objname : 路名牌 + * objectid : 3471 + * objid : 3601240103001494 + * objname : 雨水井盖 * objstate : 完好 * ordate : 20210401 - * x : 410757.9096 - * y : 3072290.091 + * x : 410816.6878 + * xl : 雨水井盖 + * y : 3072359.07 */ private String bgid; @@ -34,6 +36,7 @@ private String deptname1; private String deptname2; private String deptname3; + private String dl; private String note; private int objectid; private String objid; @@ -41,6 +44,7 @@ private String objstate; private int ordate; private double x; + private String xl; private double y; public String getBgid() { @@ -115,6 +119,14 @@ this.deptname3 = deptname3; } + public String getDl() { + return dl; + } + + public void setDl(String dl) { + this.dl = dl; + } + public String getNote() { return note; } @@ -171,6 +183,14 @@ this.x = x; } + public String getXl() { + return xl; + } + + public void setXl(String xl) { + this.xl = xl; + } + public double getY() { return y; } diff --git a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java index b8e613f..c465906 100644 --- a/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/bean/ShopFeatureBean.java @@ -1,16 +1,53 @@ package com.casic.dcms.bean; +import com.google.gson.annotations.SerializedName; + public class ShopFeatureBean { /** - * bgid : 361024100011001 - * dutyname : 又一村特色早餐店 - * objectid : 3026 + * bgid : 361024100012001 + * commuid : + * communame : + * datasource : + * deptname : + * dutyname : + * dutyrange : + * gis.sde.店铺三包.area : + * notes : + * objectid : 2888 + * objid : 361024002886 + * objstate : + * picture : + * position_ : + * shape_leng : 0.0 + * streetid : + * streetname : + * tel : + * usestate : + * usingway : */ private String bgid; + private String commuid; + private String communame; + private String datasource; + private String deptname; private String dutyname; + private String dutyrange; + @SerializedName("gis.sde.店铺三包.area") + private String _$GisSdeArea121; // FIXME check this code + private String notes; private int objectid; + private String objid; + private String objstate; + private String picture; + private String position_; + private double shape_leng; + private String streetid; + private String streetname; + private String tel; + private String usestate; + private String usingway; public String getBgid() { return bgid; @@ -20,6 +57,38 @@ this.bgid = bgid; } + public String getCommuid() { + return commuid; + } + + public void setCommuid(String commuid) { + this.commuid = commuid; + } + + public String getCommuname() { + return communame; + } + + public void setCommuname(String communame) { + this.communame = communame; + } + + public String getDatasource() { + return datasource; + } + + public void setDatasource(String datasource) { + this.datasource = datasource; + } + + public String getDeptname() { + return deptname; + } + + public void setDeptname(String deptname) { + this.deptname = deptname; + } + public String getDutyname() { return dutyname; } @@ -28,6 +97,30 @@ this.dutyname = dutyname; } + public String getDutyrange() { + return dutyrange; + } + + public void setDutyrange(String dutyrange) { + this.dutyrange = dutyrange; + } + + public String get_$GisSdeArea121() { + return _$GisSdeArea121; + } + + public void set_$GisSdeArea121(String _$GisSdeArea121) { + this._$GisSdeArea121 = _$GisSdeArea121; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public int getObjectid() { return objectid; } @@ -35,4 +128,84 @@ public void setObjectid(int objectid) { this.objectid = objectid; } + + public String getObjid() { + return objid; + } + + public void setObjid(String objid) { + this.objid = objid; + } + + public String getObjstate() { + return objstate; + } + + public void setObjstate(String objstate) { + this.objstate = objstate; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public String getPosition_() { + return position_; + } + + public void setPosition_(String position_) { + this.position_ = position_; + } + + public double getShape_leng() { + return shape_leng; + } + + public void setShape_leng(double shape_leng) { + this.shape_leng = shape_leng; + } + + public String getStreetid() { + return streetid; + } + + public void setStreetid(String streetid) { + this.streetid = streetid; + } + + public String getStreetname() { + return streetname; + } + + public void setStreetname(String streetname) { + this.streetname = streetname; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getUsestate() { + return usestate; + } + + public void setUsestate(String usestate) { + this.usestate = usestate; + } + + public String getUsingway() { + return usingway; + } + + public void setUsingway(String usingway) { + this.usingway = usingway; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 75f297c..3c1d767 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -88,7 +88,7 @@ caseType = getIntent().getStringExtra("type"); gson = new Gson(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(2000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(3000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); @@ -110,15 +110,15 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + //部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); break; case "三包上报": - //门前三包 (ID: 2) - ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); + //门前三包 (ID: 1) + ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); packageLayer = new FeatureLayer(packageFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, packageLayer)); @@ -167,6 +167,7 @@ Map attributes = element.getAttributes(); pointList.add(attributes); } +// Log.d(TAG, "onCommunityFeatureGet: " + gson.toJson(pointList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); @@ -182,8 +183,8 @@ featureBean.getBgid(), featureBean.getObjid(), featureBean.getObjname(), - featureBean.getDeptname1(), - featureBean.getDeptname2(), + featureBean.getDl(), + featureBean.getXl(), (String) feature.getAttributes().get("Note")); } }); @@ -232,8 +233,8 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - "", - "", + featureBean.getTel(), + "暂无", String.valueOf(featureBean.getObjectid())); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f7102ad..6ec54e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -18,32 +18,21 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; -import com.casic.dcms.utils.ColorHelper; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; @@ -62,8 +51,7 @@ import butterknife.OnClick; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, - ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) @@ -77,7 +65,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -93,7 +81,7 @@ @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.caseHandleResultView) - EditText caseHandleResultView; + TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; @BindView(R.id.caseCheckRecyclerView) @@ -108,8 +96,6 @@ QMUIRoundButton submitButton; private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -117,8 +103,6 @@ private String id; private String changeState; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -140,8 +124,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -157,80 +139,26 @@ submitButton.setChangeAlphaWhenPress(true); } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleTimeLayout, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseHandleTimeLayout: - new TimePickerDialog.Builder().setThemeColor(ColorHelper.getResourcesColor(this, R.color.mainThemeColor)) - .setTitleStringId("请选择处理时间") - .setWheelItemTextSize(16) - .setCyclic(false) - .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) - .setMaxMillseconds(System.currentTimeMillis()) - .setType(Type.ALL) - .setCallBack((timePickerView, millSeconds) -> { - caseHandleTimeView.setText(TimeOrDateUtil.timestampToDate(millSeconds)); - }).build().show(getSupportFragmentManager(), "all"); + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.addImageView: new QMUIDialog.MenuDialogBuilder(this) @@ -329,7 +257,7 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); @@ -386,33 +314,8 @@ }); imageAdapter.setDeleteView(false); } - } - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); +// caseHandleTimeView.setText(); } } @@ -524,12 +427,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (uploadImagePresenter != null) { uploadImagePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index d1376ec..8235354 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -18,20 +19,14 @@ import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; import com.casic.dcms.mvp.view.ICaseHandleView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -57,8 +52,7 @@ import butterknife.OnClick; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseLargeClassView, ICaseSmallClassView, ICaseNextNodeView, IUploadFileView, - ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) @@ -72,7 +66,7 @@ @BindView(R.id.caseCommunityView) TextView caseCommunityView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; @BindView(R.id.caseHandleView) @@ -85,10 +79,14 @@ TextView caseEndTimeView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; + @BindView(R.id.imageLayout) + RelativeLayout imageLayout; @BindView(R.id.caseHandleRecyclerView) RecyclerView caseHandleRecyclerView; @BindView(R.id.addImageView) ImageView addImageView; + @BindView(R.id.reasonLayout) + RelativeLayout reasonLayout; @BindView(R.id.caseReasonView) EditText caseReasonView; @BindView(R.id.submitButton) @@ -100,14 +98,10 @@ private String caseReason; private String approvalResult; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List largeClassBeans = new ArrayList<>(); - private List smallClassBeans = new ArrayList<>(); private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; private CaseNextNodePresenterImpl caseNextNodePresenter; private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; @@ -131,8 +125,6 @@ caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); @@ -156,12 +148,10 @@ caseTypeView.setText(data.getEorcName()); caseLargeTypeView.setText(data.getCasetypeName()); caseSmallTypeView.setText(data.getCasetypeDetailName()); - caseCommunityView.setText(data.getCommunityName().equals("") ? "社区信息未知" : data.getCommunityName()); + caseCommunityView.setText(data.getCommunityName().equals("") ? "无更详细社区信息" : data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); caseHandleView.setText(data.getCaseStateName().equals("") ? "无处理意见" : data.getCaseStateName()); - caseStartTimeView.setText(data.getCreateTime()); - caseEndTimeView.setText(data.getNodeLimittime()); String verifyImages = data.getFileIdVerify(); if (!TextUtils.isEmpty(verifyImages)) { @@ -185,33 +175,9 @@ }); imageAdapter.setDeleteView(false); } - } - } - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - caseLargeTypeView.setText("无小类"); - } else { - caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - caseSmallTypeView.setText("请选择"); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - caseSmallTypeView.setText("无小类"); - } else { - caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } + caseStartTimeView.setText(data.getCreateTime()); + caseEndTimeView.setText(data.getNodeLimittime()); } } @@ -230,7 +196,15 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - caseHandleResultView.setText(dataBean.getNextOperation()); + String nextOperation = dataBean.getNextOperation(); + caseHandleResultView.setText(nextOperation); + if (nextOperation.equals("处理完成")) { + imageLayout.setVisibility(View.VISIBLE); + reasonLayout.setVisibility(View.GONE); + } else { + imageLayout.setVisibility(View.GONE); + reasonLayout.setVisibility(View.VISIBLE); + } changeState = String.valueOf(dataBean.getNextState()); approvalResult = dataBean.getApprovalResult(); } @@ -240,68 +214,26 @@ } } - @OnClick({R.id.caseClassLayout, R.id.caseLargeClassLayout, R.id.caseSmallClassLayout, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addImageView, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.caseClassLayout: - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseTypeView.setText(tag); - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - break; - case R.id.caseLargeClassLayout: - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseLargeTypeView.setText(tag); - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - String typeId = dataBean.getId(); - caseSmallClassPresenter.onReadyRetrofitRequest(dataBean.getEorc(), typeId); - } - }).build().show(); - } + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; } - break; - case R.id.caseSmallClassLayout: - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - - caseSmallTypeView.setText(tag); - } - }).build().show(); - } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); break; case R.id.caseHandleResultLayout: caseNextNodePresenter.onReadyRetrofitRequest(String.valueOf(data.getCaseState())); @@ -486,12 +418,6 @@ if (caseDetailPresenter != null) { caseDetailPresenter.disposeRetrofitRequest(); } - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } if (caseNextNodePresenter != null) { caseNextNodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a8a4b96..f7f8000 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -22,6 +22,9 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { @@ -33,6 +36,7 @@ RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; private QMUITipDialog loadingDialog; + private List dataBeans = new ArrayList<>(); @Override public int initLayoutView() { @@ -73,9 +77,13 @@ @Override public void obtainCaseProcessData(CaseProcessBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - ProcessLineAdapter adapter = new ProcessLineAdapter(this, resultBean.getData()); + //将数据逆序加载，便于查看 + int size = resultBean.getData().size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, resultBean.getData().get(size - 1 - i)); + } + ProcessLineAdapter adapter = new ProcessLineAdapter(this, dataBeans); processRecyclerView.setLayoutManager(new LinearLayoutManager(this)); processRecyclerView.setHasFixedSize(true); processRecyclerView.setNestedScrollingEnabled(false); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f0c8d7c..d38a451 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.EditText; @@ -46,7 +47,7 @@ @BindView(R.id.caseHandleStatusView) TextView caseHandleStatusView; @BindView(R.id.casePlaceView) - EditText casePlaceView; + TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; @BindView(R.id.casePicRecyclerView) @@ -100,10 +101,27 @@ } - @OnClick({R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index d6ae927..07ad6b2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -153,7 +153,7 @@ intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); break; - case R.id.handleLayout: + case R.id.caseHandleLayout: OtherUtils.showCaseProcess(this, data.getProcessId()); break; default: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index efa90e5..7d9ffc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -375,8 +375,18 @@ startActivityForResult(intent, Constant.REQUEST_MAP_CODE); } else { Intent intent = new Intent(this, DisplayMapActivity.class); - intent.putExtra("lng", Double.parseDouble(data.getLng())); - intent.putExtra("lat", Double.parseDouble(data.getLat())); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); startActivity(intent); } break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 5d74463..4ab4cb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.location.Location; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -28,6 +27,7 @@ import com.casic.dcms.utils.BroadcastManager; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StatusBarColorUtil; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.NoScrollViewPager; @@ -92,14 +92,14 @@ } } }); - String ANDROID_ID = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - if (TextUtils.isEmpty(ANDROID_ID)) { + String imei = OtherUtils.obtainSimCardSerialNumber(this); + if (TextUtils.isEmpty(imei)) { return; } LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - uploadPositionPresenter.onReadyRetrofitRequest(ANDROID_ID, + uploadPositionPresenter.onReadyRetrofitRequest(imei, String.valueOf(location.getLatitude()), String.valueOf(location.getLongitude())); } diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 877d23d..5dde493 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -6,7 +6,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.utils.Constant; +import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.mapping.ArcGISMap; +import com.esri.arcgisruntime.mapping.Basemap; +import com.esri.arcgisruntime.mapping.BasemapStyle; +import com.esri.arcgisruntime.mapping.view.MapView; +import com.qmuiteam.qmui.skin.QMUISkinManager; import com.qmuiteam.qmui.widget.QMUITopBarLayout; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; @@ -14,6 +22,8 @@ @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; + @BindView(R.id.mapView) + MapView mapView; @Override public int initLayoutView() { @@ -34,11 +44,73 @@ @Override public void initData() { + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 + mapView.setViewpointScaleAsync(12000);//数字越大，放大比例越小，缩放比例[36000,250] + ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); + arcGISMap.setMinScale(36000); + arcGISMap.setMaxScale(250); + //创建底图、并设置底图图层 + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); + Basemap basemap = new Basemap(baseLayer); + arcGISMap.setBasemap(basemap); + mapView.setMap(arcGISMap); } @Override public void initEvent() { + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + } + + protected void onResume() { + super.onResume(); + mapView.resume(); + } + + @Override + protected void onPause() { + super.onPause(); + mapView.pause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mapView.dispose(); } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 5d977b5..55b4001 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index c312ca3..0249678 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 5fb7eb8..34b3ab8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c7b467c..95f87b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index feec285..8365c68 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -19,6 +20,7 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -86,6 +88,8 @@ }); } +// private static final String TAG = "OvertimeCaseFragment"; + @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); @@ -93,9 +97,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 2ee3f1a..4a8d33e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 4b5d45b..cc7d9b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 5d51969..84d39e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 92eabcd..1daf3ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -90,9 +90,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 51bdbd0..8d35bfd 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,9 +91,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index 43d604f..acad9fe 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -93,9 +93,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 1ce23d9..f94153b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -92,9 +92,7 @@ List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - for (int i = 0; i < dataRows.size(); i++) { - dataBeans.add(0, dataRows.get(i)); - } + dataBeans = dataRows; refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e996a24..f23faf4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -13,7 +13,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.CALL_PHONE}; + Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final List ALL_ICONS = Arrays.asList( R.mipmap.ajsb, R.mipmap.kssb, R.mipmap.sbsb, diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index 62b84dd..ae0af17 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -1,14 +1,26 @@ package com.casic.dcms.utils; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import androidx.core.app.ActivityCompat; import com.casic.dcms.ui.CaseProcessActivity; import com.casic.dcms.widgets.BigPictureDialog; +import java.lang.reflect.Method; import java.util.List; public class OtherUtils { + private static final String TAG = "OtherUtils"; + //查看大图 public static void showBigImage(Context context, int index, List imageList) { new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); @@ -20,4 +32,48 @@ intent.putExtra("processId", processId); context.startActivity(intent); } + + //获取SimSerialNumber + @SuppressLint({"HardwareIds"}) + public static String obtainSimCardSerialNumber(Context context) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //Android 10改为获取Android_ID + return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); + } else { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Class telephonyClass; + try { + telephonyClass = Class.forName(telephony.getClass().getName()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + String imei = telephony.getDeviceId(); + if (TextUtils.isEmpty(imei)) { + Method m = telephonyClass.getMethod("getSimSerialNumber", int.class); + //主卡，卡1 + String mainCard = (String) m.invoke(telephony, 0); + //副卡，卡2 + String otherCard = (String) m.invoke(telephony, 1); + return mainCard; + } else { + return imei; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return ""; + } + + public static String obtainPhoneInfo(Context context) { + TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + StringBuilder sb = new StringBuilder(); + + sb.append("\nDeviceID(IMEI)" + telephony.getDeviceId()); + if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return ""; + } + + return sb.toString(); + } } diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml new file mode 100644 index 0000000..4c7fba9 --- /dev/null +++ b/app/src/main/res/drawable/ic_cesuo.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml new file mode 100644 index 0000000..7b76835 --- /dev/null +++ b/app/src/main/res/drawable/ic_cheliang.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml new file mode 100644 index 0000000..dec6893 --- /dev/null +++ b/app/src/main/res/drawable/ic_huanwei.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ludeng.xml b/app/src/main/res/drawable/ic_ludeng.xml new file mode 100644 index 0000000..3e2f58b --- /dev/null +++ b/app/src/main/res/drawable/ic_ludeng.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml new file mode 100644 index 0000000..3846f25 --- /dev/null +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 58bc5d4..5cf0b7e 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -16,28 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - + @@ -107,7 +86,6 @@ @@ -117,6 +95,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="25dp" android:background="@drawable/bg_layout" android:paddingHorizontal="20dp" android:paddingVertical="5dp" @@ -149,7 +128,6 @@ - @@ -173,9 +148,7 @@ - + - - @@ -206,7 +172,7 @@ - - - - - - - - - - + @@ -135,7 +114,9 @@ - + - + - + android:textSize="@dimen/textFontSize" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_check.xml b/app/src/main/res/layout/item_case_check.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_check.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_handle.xml b/app/src/main/res/layout/item_case_handle.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_handle.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_overtime.xml b/app/src/main/res/layout/item_case_overtime.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_overtime.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_process.xml b/app/src/main/res/layout/item_case_process.xml index 106ea95..a9b9c6c 100644 --- a/app/src/main/res/layout/item_case_process.xml +++ b/app/src/main/res/layout/item_case_process.xml @@ -79,7 +79,9 @@ android:textSize="@dimen/titleFontSize" /> - + + android:paddingHorizontal="@dimen/padding_10dp" + android:paddingVertical="5dp"> + android:textSize="24sp" /> - - + android:textColor="@color/black" + android:textSize="@dimen/textFontSize" /> - + android:layout_below="@id/caseTitleView" + android:layout_marginStart="@dimen/margin_10dp" + android:layout_marginTop="3dp" + android:layout_toEndOf="@id/v" + android:gravity="center" + android:singleLine="true" + android:text="发生地点：餐厅门口" + android:textColor="@color/textColor" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_urgent.xml b/app/src/main/res/layout/item_case_urgent.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_urgent.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_verify.xml b/app/src/main/res/layout/item_case_verify.xml deleted file mode 100644 index c88d47b..0000000 --- a/app/src/main/res/layout/item_case_verify.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file