diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java index cfc821f..3e4c6a1 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityThreePackageBinding; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java index cfc821f..3e4c6a1 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityThreePackageBinding; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java index 42d2dc0..fe67d3f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityPersonBinding; import com.casic.dcms.mvvm.view.fragment.PersonListFragment; import com.casic.dcms.mvvm.view.fragment.PersonOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.personTabLayout.setupWithViewPager(viewBinding.personViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.personTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java index cfc821f..3e4c6a1 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityThreePackageBinding; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java index 42d2dc0..fe67d3f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityPersonBinding; import com.casic.dcms.mvvm.view.fragment.PersonListFragment; import com.casic.dcms.mvvm.view.fragment.PersonOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.personTabLayout.setupWithViewPager(viewBinding.personViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.personTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java index dfd8d42..012cf39 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityStreetLightBinding; import com.casic.dcms.mvvm.view.fragment.LightOnListFragment; import com.casic.dcms.mvvm.view.fragment.LightOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java index cfc821f..3e4c6a1 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityThreePackageBinding; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java index 42d2dc0..fe67d3f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityPersonBinding; import com.casic.dcms.mvvm.view.fragment.PersonListFragment; import com.casic.dcms.mvvm.view.fragment.PersonOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.personTabLayout.setupWithViewPager(viewBinding.personViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.personTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java index dfd8d42..012cf39 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityStreetLightBinding; import com.casic.dcms.mvvm.view.fragment.LightOnListFragment; import com.casic.dcms.mvvm.view.fragment.LightOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 9f8ff1f..b9b4355 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseUrgentBinding; import com.casic.dcms.mvvm.view.fragment.urgent.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.urgent.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java index cfc821f..3e4c6a1 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityThreePackageBinding; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java index 42d2dc0..fe67d3f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityPersonBinding; import com.casic.dcms.mvvm.view.fragment.PersonListFragment; import com.casic.dcms.mvvm.view.fragment.PersonOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.personTabLayout.setupWithViewPager(viewBinding.personViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.personTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java index dfd8d42..012cf39 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityStreetLightBinding; import com.casic.dcms.mvvm.view.fragment.LightOnListFragment; import com.casic.dcms.mvvm.view.fragment.LightOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 9f8ff1f..b9b4355 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseUrgentBinding; import com.casic.dcms.mvvm.view.fragment.urgent.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.urgent.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 3bb2d08..b4dd42c 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityVerifyCaseBinding; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java index cfc821f..3e4c6a1 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityThreePackageBinding; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java index 42d2dc0..fe67d3f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityPersonBinding; import com.casic.dcms.mvvm.view.fragment.PersonListFragment; import com.casic.dcms.mvvm.view.fragment.PersonOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.personTabLayout.setupWithViewPager(viewBinding.personViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.personTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java index dfd8d42..012cf39 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityStreetLightBinding; import com.casic.dcms.mvvm.view.fragment.LightOnListFragment; import com.casic.dcms.mvvm.view.fragment.LightOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 9f8ff1f..b9b4355 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseUrgentBinding; import com.casic.dcms.mvvm.view.fragment.urgent.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.urgent.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 3bb2d08..b4dd42c 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityVerifyCaseBinding; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java index 907fbc9..66c2698 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java @@ -3,7 +3,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OnlinePersonAdapter; +import com.casic.dcms.adapter.PersonListAdapter; import com.casic.dcms.databinding.FragmentPersonListBinding; import com.casic.dcms.mvvm.model.PersonStatusBean; import com.casic.dcms.mvvm.model.PersonBean; @@ -20,7 +20,7 @@ private final Set deptSet = new HashSet<>(); private final List> deptAndPersons = new ArrayList<>(); //个人信息集合的集合 private PersonViewModel statusViewModel; - private OnlinePersonAdapter onlinePersonAdapter; + private PersonListAdapter onlinePersonAdapter; private List deptList = new ArrayList<>(); //部门名集合 @Override @@ -33,7 +33,7 @@ statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); statusViewModel.obtainPersonByStatus("", "", ""); - onlinePersonAdapter = new OnlinePersonAdapter(requireContext()); + onlinePersonAdapter = new PersonListAdapter(requireContext()); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java index cfc821f..3e4c6a1 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityThreePackageBinding; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java index 42d2dc0..fe67d3f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityPersonBinding; import com.casic.dcms.mvvm.view.fragment.PersonListFragment; import com.casic.dcms.mvvm.view.fragment.PersonOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.personTabLayout.setupWithViewPager(viewBinding.personViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.personTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java index dfd8d42..012cf39 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityStreetLightBinding; import com.casic.dcms.mvvm.view.fragment.LightOnListFragment; import com.casic.dcms.mvvm.view.fragment.LightOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 9f8ff1f..b9b4355 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseUrgentBinding; import com.casic.dcms.mvvm.view.fragment.urgent.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.urgent.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 3bb2d08..b4dd42c 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityVerifyCaseBinding; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java index 907fbc9..66c2698 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java @@ -3,7 +3,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OnlinePersonAdapter; +import com.casic.dcms.adapter.PersonListAdapter; import com.casic.dcms.databinding.FragmentPersonListBinding; import com.casic.dcms.mvvm.model.PersonStatusBean; import com.casic.dcms.mvvm.model.PersonBean; @@ -20,7 +20,7 @@ private final Set deptSet = new HashSet<>(); private final List> deptAndPersons = new ArrayList<>(); //个人信息集合的集合 private PersonViewModel statusViewModel; - private OnlinePersonAdapter onlinePersonAdapter; + private PersonListAdapter onlinePersonAdapter; private List deptList = new ArrayList<>(); //部门名集合 @Override @@ -33,7 +33,7 @@ statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); statusViewModel.obtainPersonByStatus("", "", ""); - onlinePersonAdapter = new OnlinePersonAdapter(requireContext()); + onlinePersonAdapter = new PersonListAdapter(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java b/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java new file mode 100644 index 0000000..702f6cc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java @@ -0,0 +1,17 @@ +package com.casic.dcms.utils; + +import android.content.Context; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; + +import com.casic.dcms.R; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; + +public class LinearLayoutHelper { + public static void setDivider(Context context, LinearLayout linearLayout) { + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(context, 12.5f)); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java index cfc821f..3e4c6a1 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityThreePackageBinding; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java index 42d2dc0..fe67d3f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityPersonBinding; import com.casic.dcms.mvvm.view.fragment.PersonListFragment; import com.casic.dcms.mvvm.view.fragment.PersonOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.personTabLayout.setupWithViewPager(viewBinding.personViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.personTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java index dfd8d42..012cf39 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityStreetLightBinding; import com.casic.dcms.mvvm.view.fragment.LightOnListFragment; import com.casic.dcms.mvvm.view.fragment.LightOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 9f8ff1f..b9b4355 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseUrgentBinding; import com.casic.dcms.mvvm.view.fragment.urgent.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.urgent.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 3bb2d08..b4dd42c 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityVerifyCaseBinding; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java index 907fbc9..66c2698 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java @@ -3,7 +3,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OnlinePersonAdapter; +import com.casic.dcms.adapter.PersonListAdapter; import com.casic.dcms.databinding.FragmentPersonListBinding; import com.casic.dcms.mvvm.model.PersonStatusBean; import com.casic.dcms.mvvm.model.PersonBean; @@ -20,7 +20,7 @@ private final Set deptSet = new HashSet<>(); private final List> deptAndPersons = new ArrayList<>(); //个人信息集合的集合 private PersonViewModel statusViewModel; - private OnlinePersonAdapter onlinePersonAdapter; + private PersonListAdapter onlinePersonAdapter; private List deptList = new ArrayList<>(); //部门名集合 @Override @@ -33,7 +33,7 @@ statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); statusViewModel.obtainPersonByStatus("", "", ""); - onlinePersonAdapter = new OnlinePersonAdapter(requireContext()); + onlinePersonAdapter = new PersonListAdapter(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java b/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java new file mode 100644 index 0000000..702f6cc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java @@ -0,0 +1,17 @@ +package com.casic.dcms.utils; + +import android.content.Context; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; + +import com.casic.dcms.R; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; + +public class LinearLayoutHelper { + public static void setDivider(Context context, LinearLayout linearLayout) { + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(context, 12.5f)); + } +} diff --git a/app/src/main/res/drawable/ic_load_error.xml b/app/src/main/res/drawable/ic_load_error.xml deleted file mode 100644 index 5ad71a1..0000000 --- a/app/src/main/res/drawable/ic_load_error.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java index cfc821f..3e4c6a1 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityThreePackageBinding; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java index 42d2dc0..fe67d3f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityPersonBinding; import com.casic.dcms.mvvm.view.fragment.PersonListFragment; import com.casic.dcms.mvvm.view.fragment.PersonOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.personTabLayout.setupWithViewPager(viewBinding.personViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.personTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java index dfd8d42..012cf39 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityStreetLightBinding; import com.casic.dcms.mvvm.view.fragment.LightOnListFragment; import com.casic.dcms.mvvm.view.fragment.LightOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 9f8ff1f..b9b4355 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseUrgentBinding; import com.casic.dcms.mvvm.view.fragment.urgent.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.urgent.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 3bb2d08..b4dd42c 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityVerifyCaseBinding; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java index 907fbc9..66c2698 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java @@ -3,7 +3,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OnlinePersonAdapter; +import com.casic.dcms.adapter.PersonListAdapter; import com.casic.dcms.databinding.FragmentPersonListBinding; import com.casic.dcms.mvvm.model.PersonStatusBean; import com.casic.dcms.mvvm.model.PersonBean; @@ -20,7 +20,7 @@ private final Set deptSet = new HashSet<>(); private final List> deptAndPersons = new ArrayList<>(); //个人信息集合的集合 private PersonViewModel statusViewModel; - private OnlinePersonAdapter onlinePersonAdapter; + private PersonListAdapter onlinePersonAdapter; private List deptList = new ArrayList<>(); //部门名集合 @Override @@ -33,7 +33,7 @@ statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); statusViewModel.obtainPersonByStatus("", "", ""); - onlinePersonAdapter = new OnlinePersonAdapter(requireContext()); + onlinePersonAdapter = new PersonListAdapter(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java b/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java new file mode 100644 index 0000000..702f6cc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java @@ -0,0 +1,17 @@ +package com.casic.dcms.utils; + +import android.content.Context; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; + +import com.casic.dcms.R; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; + +public class LinearLayoutHelper { + public static void setDivider(Context context, LinearLayout linearLayout) { + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(context, 12.5f)); + } +} diff --git a/app/src/main/res/drawable/ic_load_error.xml b/app/src/main/res/drawable/ic_load_error.xml deleted file mode 100644 index 5ad71a1..0000000 --- a/app/src/main/res/drawable/ic_load_error.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_case_process.xml b/app/src/main/res/layout/item_case_process.xml index fa159d2..4d22de6 100644 --- a/app/src/main/res/layout/item_case_process.xml +++ b/app/src/main/res/layout/item_case_process.xml @@ -1,14 +1,15 @@ - + style="@style/textViewStyle" + android:layout_height="@dimen/itemLayoutHeight" + android:text="处理图片" /> - + android:textSize="@dimen/sp_16" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index d6ee830..4f93655 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,6 +22,7 @@ + @@ -61,6 +62,7 @@ + @@ -68,6 +70,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java index 240723f..9c8fdb4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AlarmListAdapter.java @@ -22,7 +22,7 @@ public AlarmListAdapter(Context context, List dataRows) { this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java index d9ca8d4..913bde1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/AnalysisRecycleAdapter.java @@ -16,17 +16,16 @@ public class AnalysisRecycleAdapter extends RecyclerView.Adapter { - private final Context context; + private final LayoutInflater layoutInflater; public AnalysisRecycleAdapter(Context context) { - this.context = context; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 94e5e24..8d40a27 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -24,7 +24,7 @@ public CaseHandledAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java index 9e4a834..a726b94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseSearchResultAdapter.java @@ -26,7 +26,7 @@ public CaseSearchResultAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java index 5120e2c..edb41d3 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CheckCaseListAdapter.java @@ -28,7 +28,7 @@ public CheckCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index 05fd9fa..b9325dd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -25,18 +25,17 @@ public DeptAuthorizeOrAdjustAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,7 +54,7 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { -// private final TextView leftTextView; + // private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index d7f7073..b523c0d 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -25,18 +25,17 @@ public DeptDelayedOrPostAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override - public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); - return new ItemViewHolder(view); + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java index 61bbea1..63f8bf6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptExpandableAdapter.java @@ -26,8 +26,8 @@ private List groupData = new ArrayList<>(); private List> childData = new ArrayList<>(); - public DeptExpandableAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); + public DeptExpandableAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); } public void setData(@Nullable List groupList, @Nullable List> childList) { diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 1fafc8b..719f1c6 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -29,7 +29,7 @@ public DeptTodoOrHandledAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 0bc74bb..c3941bb 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,19 +18,18 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private final Context context; private final List menuData; + private final LayoutInflater layoutInflater; public HomeRecycleAdapter(Context context, List menus) { - this.context = context; this.menuData = menus; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_home_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_home_recycleview, parent, false)); } @Override 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 7aa9665..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java +++ /dev/null @@ -1,72 +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 androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -public class ImageGridViewAdapter extends BaseAdapter { - - private final Context context; - private final List images = new ArrayList<>(); - - public ImageGridViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setImageList(@Nullable List imageUrlList) { - images.clear(); - if (imageUrlList != null) { - images.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public int getCount() { - return images.size(); - } - - @Override - public Object getItem(int position) { - return images.get(position); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ItemViewHolder holder; - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); - holder = new ItemViewHolder(); - holder.imageView = convertView.findViewById(R.id.imageView); - convertView.setTag(holder); - } else { - holder = (ItemViewHolder) convertView.getTag(); - } - Glide.with(context) - .load(images.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - return convertView; - } - - private static class ItemViewHolder { - private ImageView imageView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java index 5339407..c6c4bc4 100644 --- a/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/LightResultAdapter.java @@ -1,5 +1,6 @@ package com.casic.dcms.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -17,23 +18,22 @@ public class LightResultAdapter extends RecyclerView.Adapter { - private final Context context; private final List dataBeans; + private final LayoutInflater layoutInflater; public LightResultAdapter(Context context, List beans) { - this.context = context; this.dataBeans = beans; + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_light_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_light_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull LightResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java index 34195af..9460cf8 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MainPageAdapter.java @@ -9,7 +9,7 @@ public class MainPageAdapter extends FragmentPagerAdapter { - private List fragmentList; + private final List fragmentList; public MainPageAdapter(@NonNull FragmentManager fm, List pages) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java index 1cdaa4d..bbcf7c2 100644 --- a/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/MaintainRecordAdapter.java @@ -27,7 +27,7 @@ public MaintainRecordAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java b/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java deleted file mode 100644 index 1921467..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/NineGridImageAdapter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; - -import java.util.ArrayList; -import java.util.List; - -public class NineGridImageAdapter extends RecyclerView.Adapter { - - private static final int mCountLimit = 2; - private final Context mContext; - private List mImageData = new ArrayList<>(); - - public NineGridImageAdapter(Context context) { - this.mContext = context; - } - - @SuppressLint("NotifyDataSetChanged") - public void setupImage(List images) { - this.mImageData = images; - notifyDataSetChanged(); - } - - @SuppressLint("NotifyDataSetChanged") - public void deleteImage(int position) { - if (mImageData.size() != 0) { - mImageData.remove(position); - notifyDataSetChanged(); - } - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ImageView imageView = new ImageView(mContext); - /** - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(mContext) - QMUIDisplayHelper.dp2px(mContext, 130); - int margins = QMUIDisplayHelper.dp2px(mContext, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.CENTER; - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setLayoutParams(params); - return new ItemViewHolder(imageView); - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - if (position == getItemCount() - 1 && mImageData.size() < mCountLimit) { - holder.imageView.setImageResource(R.drawable.ic_add_pic); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //添加图片 - mOnItemClickListener.onAddImageClick(); - } - }); - } else { - Glide.with(mContext) - .load(mImageData.get(position)) - .into(holder.imageView); - holder.imageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 点击操作，查看大图 - mOnItemClickListener.onItemClick(position); - } - }); - // 长按监听 - holder.imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - //长按删除 - mOnItemClickListener.onItemLongClick(v, position); - return true; - } - }); - } - } - - @Override - public int getItemCount() { - // 满3张图就不让其添加新图 - if (mImageData != null && mImageData.size() >= mCountLimit) { - return mCountLimit; - } else { - return mImageData == null ? 1 : mImageData.size() + 1; - } - } - - private OnItemClickListener mOnItemClickListener; - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.mOnItemClickListener = onItemClickListener; - } - - public interface OnItemClickListener { - void onAddImageClick(); - - void onItemClick(int position); - - void onItemLongClick(View view, int position); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private final ImageView imageView; - - private ItemViewHolder(View itemView) { - super(itemView); - imageView = (ImageView) itemView; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java deleted file mode 100644 index 5411f4f..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/OnlinePersonAdapter.java +++ /dev/null @@ -1,135 +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.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.PersonBean; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/15 13:11 - * @email : 290677893@qq.com - **/ -public class OnlinePersonAdapter extends BaseExpandableListAdapter { - - private List groupData = new ArrayList<>(); - private List> childData = new ArrayList<>(); - private final LayoutInflater layoutInflater; - - public OnlinePersonAdapter(Context mContext) { - layoutInflater = LayoutInflater.from(mContext); - } - - public void setData(@Nullable List groupList, @Nullable List> childList) { - groupData.clear(); - childData.clear(); - if (groupList != null) { - this.groupData = groupList; - if (childList != null) { - this.childData = childList; - } - } - notifyDataSetChanged(); - } - - @Override - public int getGroupCount() { - return groupData.size(); - } - - @Override - public int getChildrenCount(int groupPosition) { - return childData.get(groupPosition).size(); - } - - @Override - public Object getGroup(int groupPosition) { - return groupData.get(groupPosition); - } - - @Override - public Object getChild(int groupPosition, int childPosition) { - return childData.get(groupPosition).get(childPosition); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - GroupViewHolder groupHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); - groupHolder = new GroupViewHolder(); - groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); - convertView.setTag(groupHolder); - } else { - groupHolder = (GroupViewHolder) convertView.getTag(); - } - groupHolder.groupNameView.setText(groupData.get(groupPosition)); - return convertView; - } - - @Override - public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - ChildViewHolder itemHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); - itemHolder = new ChildViewHolder(); - itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); - itemHolder.childNameView = convertView.findViewById(R.id.childNameView); - itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); - convertView.setTag(itemHolder); - } else { - itemHolder = (ChildViewHolder) convertView.getTag(); - } - boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); - if (onLine) { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); - } else { - itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); - } - itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); - itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); - return convertView; - } - - //设置子列表是否可选中 - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - private static class GroupViewHolder { - private TextView groupNameView; - } - - private static class ChildViewHolder { - private ImageView personStatusView; - private TextView childNameView; - private TextView onlineTimeView; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java new file mode 100644 index 0000000..aa9c82d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java @@ -0,0 +1,135 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class PersonListAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public PersonListAdapter(Context context) { + this.layoutInflater = LayoutInflater.from(context); + } + + public void setData(@Nullable List groupList, @Nullable List> childList) { + groupData.clear(); + childData.clear(); + if (groupList != null) { + this.groupData = groupList; + if (childList != null) { + this.childData = childList; + } + } + notifyDataSetChanged(); + } + + @Override + public int getGroupCount() { + return groupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return childData.get(groupPosition).size(); + } + + @Override + public Object getGroup(int groupPosition) { + return groupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return childData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupViewHolder groupHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_group_list, parent, false); + groupHolder = new GroupViewHolder(); + groupHolder.groupNameView = convertView.findViewById(R.id.groupNameView); + convertView.setTag(groupHolder); + } else { + groupHolder = (GroupViewHolder) convertView.getTag(); + } + groupHolder.groupNameView.setText(groupData.get(groupPosition)); + return convertView; + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildViewHolder itemHolder; + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.item_child_online, parent, false); + itemHolder = new ChildViewHolder(); + itemHolder.personStatusView = convertView.findViewById(R.id.personStatusView); + itemHolder.childNameView = convertView.findViewById(R.id.childNameView); + itemHolder.onlineTimeView = convertView.findViewById(R.id.onlineTimeView); + convertView.setTag(itemHolder); + } else { + itemHolder = (ChildViewHolder) convertView.getTag(); + } + boolean onLine = childData.get(groupPosition).get(childPosition).isOnLine(); + if (onLine) { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_online); + } else { + itemHolder.personStatusView.setBackgroundResource(R.drawable.ic_offline); + } + itemHolder.childNameView.setText(childData.get(groupPosition).get(childPosition).getPersonName()); + itemHolder.onlineTimeView.setText(childData.get(groupPosition).get(childPosition).getLastTimeFmt()); + return convertView; + } + + //设置子列表是否可选中 + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + private static class GroupViewHolder { + private TextView groupNameView; + } + + private static class ChildViewHolder { + private ImageView personStatusView; + private TextView childNameView; + private TextView onlineTimeView; + } +} 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 ee54944..1cda0d5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/ProcessLineAdapter.java @@ -17,19 +17,18 @@ import java.util.List; public class ProcessLineAdapter extends RecyclerView.Adapter { - private final Context mContext; private final List mProcessList; + private final LayoutInflater layoutInflater; public ProcessLineAdapter(Context context, List list) { - this.mContext = context; this.mProcessList = list; + this.layoutInflater = LayoutInflater.from(context); } @NotNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_case_process, parent, false); - return new ViewHolder(view); + return new ViewHolder(layoutInflater.inflate(R.layout.item_case_process, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java index 6847158..e42f9e0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PunishTypeAdapter.java @@ -29,14 +29,13 @@ this.context = context; this.dataRows = dataRows; this.dataBean = dataBean; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_punish_recycleview, parent, false)); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index e5171d4..e1199e5 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.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; @@ -31,18 +32,17 @@ public RecordListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_record_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_record_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java index 5dce365..5edebde 100644 --- a/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/SubViewPagerAdapter.java @@ -15,8 +15,8 @@ **/ public class SubViewPagerAdapter extends FragmentPagerAdapter { - private String[] titles; - private List list; + private final String[] titles; + private final List list; public SubViewPagerAdapter(FragmentManager fm, String[] pageTitles, List fragmentList) { super(fm); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java index fdccbc4..6e61486 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseListAdapter.java @@ -24,7 +24,7 @@ public UrgentCaseListAdapter(Context context, List dataRows) { this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java index 6ddf67a..78100cc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -28,7 +28,7 @@ public VerifyCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull diff --git a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java index ab9c52f..281abfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/WellListAdapter.java @@ -27,18 +27,17 @@ public WellListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; - layoutInflater = LayoutInflater.from(context); + this.layoutInflater = LayoutInflater.from(context); } @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_well_recycleview, parent, false); - return new ItemViewHolder(view); + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_well_recycleview, parent, false)); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (buttonOptionListener != null) { holder.wellOptionButton.setChangeAlphaWhenPress(true); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java index b9ffbe9..0ceb2fb 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CheckCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCheckCaseBinding; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckFragment; import com.casic.dcms.mvvm.view.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java index ca49b3d..e6db7b8 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptHandleActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.mvvm.view.fragment.dept.DeptCasePostponeFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.mvvm.view.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -50,9 +50,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 9686049..0442c24 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.databinding.ActivityDeptTodoBinding; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; @@ -24,6 +23,7 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import com.pengxh.androidx.lite.vm.LoadState; @@ -95,7 +95,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 @@ -139,7 +139,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(context); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); imageAdapter.setImageList(urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java index 5415ae8..5460ea9 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/HandleCaseActivity.java @@ -12,9 +12,9 @@ import com.casic.dcms.mvvm.view.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseTodoFragment; import com.casic.dcms.mvvm.view.fragment.handle.CaseUrgentFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -45,9 +45,7 @@ //绑定TabLayout viewBinding.handleTabLayout.setupWithViewPager(viewBinding.handleViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.handleTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java index 8ff1c6a..9c7b316 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/OvertimeCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseOvertimeBinding; import com.casic.dcms.mvvm.view.fragment.overtime.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.overtime.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.overtimeTabLayout.setupWithViewPager(viewBinding.overtimeViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.overtimeTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java index cfc821f..3e4c6a1 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityThreePackageBinding; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.mvvm.view.fragment.threepkg.PackageTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java index 42d2dc0..fe67d3f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PersonActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityPersonBinding; import com.casic.dcms.mvvm.view.fragment.PersonListFragment; import com.casic.dcms.mvvm.view.fragment.PersonOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.personTabLayout.setupWithViewPager(viewBinding.personViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.personTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java index dfd8d42..012cf39 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/StreetlightManagerActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.databinding.ActivityStreetLightBinding; import com.casic.dcms.mvvm.view.fragment.LightOnListFragment; import com.casic.dcms.mvvm.view.fragment.LightOnMapFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -41,9 +41,7 @@ //绑定TabLayout viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.tabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java index 9f8ff1f..b9b4355 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/UrgentCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityCaseUrgentBinding; import com.casic.dcms.mvvm.view.fragment.urgent.CaseHandledFragment; import com.casic.dcms.mvvm.view.fragment.urgent.CaseTodoFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.urgentTabLayout.setupWithViewPager(viewBinding.urgentViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.urgentTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 3bb2d08..b4dd42c 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -10,10 +10,10 @@ import com.casic.dcms.databinding.ActivityVerifyCaseBinding; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.mvvm.view.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; -import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -40,9 +40,7 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); + LinearLayoutHelper.setDivider(this, linearLayout); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java index 907fbc9..66c2698 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/PersonListFragment.java @@ -3,7 +3,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.OnlinePersonAdapter; +import com.casic.dcms.adapter.PersonListAdapter; import com.casic.dcms.databinding.FragmentPersonListBinding; import com.casic.dcms.mvvm.model.PersonStatusBean; import com.casic.dcms.mvvm.model.PersonBean; @@ -20,7 +20,7 @@ private final Set deptSet = new HashSet<>(); private final List> deptAndPersons = new ArrayList<>(); //个人信息集合的集合 private PersonViewModel statusViewModel; - private OnlinePersonAdapter onlinePersonAdapter; + private PersonListAdapter onlinePersonAdapter; private List deptList = new ArrayList<>(); //部门名集合 @Override @@ -33,7 +33,7 @@ statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); statusViewModel.obtainPersonByStatus("", "", ""); - onlinePersonAdapter = new OnlinePersonAdapter(requireContext()); + onlinePersonAdapter = new PersonListAdapter(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java b/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java new file mode 100644 index 0000000..702f6cc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/LinearLayoutHelper.java @@ -0,0 +1,17 @@ +package com.casic.dcms.utils; + +import android.content.Context; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; + +import com.casic.dcms.R; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; + +public class LinearLayoutHelper { + public static void setDivider(Context context, LinearLayout linearLayout) { + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(context, 12.5f)); + } +} diff --git a/app/src/main/res/drawable/ic_load_error.xml b/app/src/main/res/drawable/ic_load_error.xml deleted file mode 100644 index 5ad71a1..0000000 --- a/app/src/main/res/drawable/ic_load_error.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_case_process.xml b/app/src/main/res/layout/item_case_process.xml index fa159d2..4d22de6 100644 --- a/app/src/main/res/layout/item_case_process.xml +++ b/app/src/main/res/layout/item_case_process.xml @@ -1,14 +1,15 @@ - + style="@style/textViewStyle" + android:layout_height="@dimen/itemLayoutHeight" + android:text="处理图片" /> - + android:textSize="@dimen/sp_16" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/item_select_gridview.xml b/app/src/main/res/layout/item_select_gridview.xml deleted file mode 100644 index 612640b..0000000 --- a/app/src/main/res/layout/item_select_gridview.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file