diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index cd0dd1e..cd66472 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.WorkerOnMapActivity; @@ -54,7 +54,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index cd0dd1e..cd66472 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.WorkerOnMapActivity; @@ -54,7 +54,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 9232e98..98a7d7b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; @@ -72,7 +72,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index cd0dd1e..cd66472 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.WorkerOnMapActivity; @@ -54,7 +54,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 9232e98..98a7d7b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; @@ -72,7 +72,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index 074512f..4bf22a1 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -96,7 +96,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("快速上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index cd0dd1e..cd66472 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.WorkerOnMapActivity; @@ -54,7 +54,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 9232e98..98a7d7b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; @@ -72,7 +72,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index 074512f..4bf22a1 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -96,7 +96,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("快速上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index e796554..cb4f727 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -24,7 +24,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -89,7 +89,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("三包上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index cd0dd1e..cd66472 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.WorkerOnMapActivity; @@ -54,7 +54,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 9232e98..98a7d7b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; @@ -72,7 +72,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index 074512f..4bf22a1 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -96,7 +96,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("快速上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index e796554..cb4f727 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -24,7 +24,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -89,7 +89,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("三包上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 3fbbf52..04ae27f 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -41,7 +41,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -133,7 +133,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index cd0dd1e..cd66472 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.WorkerOnMapActivity; @@ -54,7 +54,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 9232e98..98a7d7b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; @@ -72,7 +72,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index 074512f..4bf22a1 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -96,7 +96,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("快速上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index e796554..cb4f727 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -24,7 +24,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -89,7 +89,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("三包上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 3fbbf52..04ae27f 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -41,7 +41,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -133,7 +133,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 3be4dfa..1f829b4 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index cd0dd1e..cd66472 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.WorkerOnMapActivity; @@ -54,7 +54,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 9232e98..98a7d7b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; @@ -72,7 +72,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index 074512f..4bf22a1 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -96,7 +96,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("快速上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index e796554..cb4f727 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -24,7 +24,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -89,7 +89,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("三包上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 3fbbf52..04ae27f 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -41,7 +41,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -133,7 +133,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 3be4dfa..1f829b4 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java index 03d2e42..b00213a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核实"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index cd0dd1e..cd66472 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.WorkerOnMapActivity; @@ -54,7 +54,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 9232e98..98a7d7b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; @@ -72,7 +72,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index 074512f..4bf22a1 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -96,7 +96,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("快速上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index e796554..cb4f727 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -24,7 +24,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -89,7 +89,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("三包上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 3fbbf52..04ae27f 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -41,7 +41,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -133,7 +133,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 3be4dfa..1f829b4 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java index 03d2e42..b00213a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核实"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 439f5ac..28e9fea 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -114,7 +114,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核实"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index cd0dd1e..cd66472 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.WorkerOnMapActivity; @@ -54,7 +54,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 9232e98..98a7d7b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; @@ -72,7 +72,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index 074512f..4bf22a1 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -96,7 +96,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("快速上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index e796554..cb4f727 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -24,7 +24,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -89,7 +89,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("三包上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 3fbbf52..04ae27f 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -41,7 +41,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -133,7 +133,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 3be4dfa..1f829b4 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java index 03d2e42..b00213a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核实"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 439f5ac..28e9fea 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -114,7 +114,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核实"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/worker/OnLineWorkerActivity.java b/app/src/main/java/com/casic/dcms/view/worker/OnLineWorkerActivity.java index 56b30e0..86f5d25 100644 --- a/app/src/main/java/com/casic/dcms/view/worker/OnLineWorkerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/worker/OnLineWorkerActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.model.WorkerBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WorkerViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -60,7 +60,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.java deleted file mode 100644 index 0ebee30..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PersonListAdapter.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.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/WorkerAdapter.java b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.java new file mode 100644 index 0000000..55587d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/WorkerAdapter.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.model.PersonBean; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/15 13:11 + * @email : 290677893@qq.com + **/ +public class WorkerAdapter extends BaseExpandableListAdapter { + + private List groupData = new ArrayList<>(); + private List> childData = new ArrayList<>(); + private final LayoutInflater layoutInflater; + + public WorkerAdapter(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/utils/ColorHub.java b/app/src/main/java/com/casic/dcms/utils/ColorHub.java deleted file mode 100644 index 576ba6a..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ColorHub.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; - -import com.pengxh.androidx.lite.kit.IntKit; - -import java.util.ArrayList; -import java.util.Random; - -public class ColorHub { - /** - * 随机生成颜色 - */ - public static int[] generateColor(Context context) { - ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); - - for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { - colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); - } - - int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); - return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ColorKit.java b/app/src/main/java/com/casic/dcms/utils/ColorKit.java new file mode 100644 index 0000000..1f28f98 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ColorKit.java @@ -0,0 +1,24 @@ +package com.casic.dcms.utils; + +import android.content.Context; + +import com.pengxh.androidx.lite.kit.IntKit; + +import java.util.ArrayList; +import java.util.Random; + +public class ColorKit { + /** + * 随机生成颜色 + */ + public static int[] generateColor(Context context) { + ArrayList colorCollection = new ArrayList<>(LocaleConstant.BACKGROUND_COLOR.size()); + + for (int i = 0; i < LocaleConstant.BACKGROUND_COLOR.size(); i++) { + colorCollection.add(new int[]{LocaleConstant.BACKGROUND_COLOR.get(i), LocaleConstant.TEXT_COLOR.get(i)}); + } + + int[] colorArray = colorCollection.get(new Random().nextInt(colorCollection.size())); + return new int[]{IntKit.convertColor(context, colorArray[0]), IntKit.convertColor(context, colorArray[1])}; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java index ce85f2f..933b322 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpRequestManager.java @@ -23,7 +23,7 @@ import rx.schedulers.Schedulers; public class HttpRequestManager { - private static final String TAG = "HttpRequestHub"; + private static final String TAG = "HttpRequestManager"; private final String key; private final String value; private final String url; diff --git a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java b/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java deleted file mode 100644 index b3a8e4f..0000000 --- a/app/src/main/java/com/casic/dcms/utils/TimeLineDecoration.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class TimeLineDecoration extends RecyclerView.ItemDecoration { - - public static final int NORMAL = 0; - public static final int BEGIN = 1; - public static final int END = 2; - public static final int END_FULL = 3; - public static final int LINE = 4; - public static final int LINE_FULL = 5; - public static final int CUSTOM = 6; - - @IntDef({NORMAL, BEGIN, END, END_FULL, LINE, LINE_FULL, CUSTOM}) - @Retention(RetentionPolicy.SOURCE) - public @interface TimeLineType { - - } - - public static abstract class TimeLineAdapter implements TimeLineCallback { - - @Override - public boolean isShowDivider(int position) { - return false; - } - - @Nullable - @Override - public Rect getRect(int position) { - return null; - } - } - - public interface TimeLineCallback { - - boolean isShowDivider(int position); - - @Nullable - Rect getRect(int position); - - @TimeLineType - int getTimeLineType(int position); - - } - - private float dividerHeight; - private float dividerPaddingLeft; - private float dividerPaddingRight; - @NonNull - private Paint dividerPaint; - - private int lineWidth; - @NonNull - private Paint linePaint; - - private int leftDistance; - private int topDistance; - - @NonNull - private Paint markerPaint; - private int markerRadius; - - @Nullable - private Drawable beginMarker; - private int beginMarkerRadius; - @Nullable - private Drawable endMarker; - private int endMarkerRadius; - @Nullable - private Drawable normalMarker; - private int normalMarkerRadius; - @Nullable - private Drawable customMarker; - private int customMarkerRadius; - - private final Context context; - @Nullable - private TimeLineCallback callback; - - public TimeLineDecoration(@NonNull Context context) { - this.context = context; - - dividerPaint = new Paint(); - dividerPaint.setAntiAlias(true); - dividerPaint.setStyle(Paint.Style.FILL); - - linePaint = new Paint(); - linePaint.setAntiAlias(true); - linePaint.setStyle(Paint.Style.FILL); - linePaint.setColor(getColor(android.R.color.black)); - - markerPaint = new Paint(); - markerPaint.setAntiAlias(true); - markerPaint.setStyle(Paint.Style.FILL); - markerPaint.setColor(context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName())); - } - - public TimeLineDecoration setDividerHeight(@FloatRange(from = 0.0f) float height) { - this.dividerHeight = dp2px(height); - return this; - } - - public TimeLineDecoration setDividerColor(@ColorRes int color) { - dividerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setDividerPaddingLeft(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingLeft = dp2px(padding); - return this; - } - - public TimeLineDecoration setDividerPaddingRight(@FloatRange(from = 0.0f) float padding) { - this.dividerPaddingRight = dp2px(padding); - return this; - } - - public TimeLineDecoration setLineColor(@ColorRes int color) { - linePaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setLineWidth(@FloatRange(from = 0.0f) float width) { - this.lineWidth = dp2px(width); - return this; - } - - public TimeLineDecoration setLeftDistance(@IntRange(from = 0) int distance) { - this.leftDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setTopDistance(@IntRange(from = 0) int distance) { - this.topDistance = dp2px(distance); - return this; - } - - public TimeLineDecoration setMarkerColor(@ColorRes int color) { - markerPaint.setColor(getColor(color)); - return this; - } - - public TimeLineDecoration setMarkerRadius(@FloatRange(from = 0.0f) float radius) { - this.markerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarkerRadius(@FloatRange(from = 0.0f) float radius) { - beginMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setBeginMarker(@DrawableRes int resId) { - return setBeginMarker(getDrawable(resId)); - } - - public TimeLineDecoration setBeginMarker(@NonNull Drawable drawable) { - beginMarker = drawable; - beginMarkerRadius = beginMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setEndMarkerRadius(@FloatRange(from = 0.0f) float radius) { - endMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setEndMarker(@DrawableRes int resId) { - return setEndMarker(getDrawable(resId)); - } - - public TimeLineDecoration setEndMarker(@NonNull Drawable drawable) { - endMarker = drawable; - endMarkerRadius = endMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setNormalMarkerRadius(@FloatRange(from = 0.0f) float radius) { - normalMarkerRadius = dp2px(radius); - return this; - } - - public TimeLineDecoration setNormalMarker(@DrawableRes int resId) { - return setNormalMarker(getDrawable(resId)); - } - - public TimeLineDecoration setNormalMarker(@NonNull Drawable drawable) { - normalMarker = drawable; - normalMarkerRadius = normalMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCustomMarker(@DrawableRes int resId) { - return setCustomMarker(getDrawable(resId)); - } - - public TimeLineDecoration setCustomMarker(@NonNull Drawable drawable) { - customMarker = drawable; - customMarkerRadius = customMarker.getIntrinsicWidth() / 2; - return this; - } - - public TimeLineDecoration setCallback(@Nullable TimeLineCallback callback) { - this.callback = callback; - return this; - } - - private int dp2px(@FloatRange(from = 0.0f) float dpValue) { - return dp2px(context, dpValue); - } - - public static int dp2px(Context context, @FloatRange(from = 0.0f) float dpValue) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpValue * scale + 0.5f); - } - - private Drawable getDrawable(@DrawableRes int resId) { - return ContextCompat.getDrawable(context, resId); - } - - @ColorInt - private int getColor(@ColorRes int resId) { - return ContextCompat.getColor(context, resId); - } - - @Override - public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - if (callback.isShowDivider(position)) - drawDivider(canvas, view, parent.getRight()); - } - } - - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) { - outRect.set(0, 0, 0, 0); - } else { - final Rect rect = callback.getRect(parent.getChildAdapterPosition(view)); - outRect.set(rect == null ? new Rect() : rect); - } - } - - @Override - public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (callback == null) return; - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View view = parent.getChildAt(i); - final int position = parent.getChildAdapterPosition(view); - - final Rect rect = callback.getRect(position); - final int bottomMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin + (rect == null ? 0 : rect.bottom); - final int topMargin = ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).topMargin + (rect == null ? 0 : rect.top); - - switch (callback.getTimeLineType(position)) { - case NORMAL: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, normalMarker, normalMarkerRadius); - break; - - case BEGIN: - drawLine(canvas, view.getTop() + topDistance + beginMarkerRadius, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, beginMarker, beginMarkerRadius); - break; - - case END: - drawLine(canvas, view.getTop() - topMargin, view.getTop() + bottomMargin + topDistance + (endMarker == null ? markerRadius : endMarkerRadius)); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case END_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - drawMarkerOrCircle(canvas, view, endMarker, endMarkerRadius); - break; - - case LINE: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - break; - - case LINE_FULL: - drawLine(canvas, view.getTop() - topMargin, parent.getBottom()); - break; - - case CUSTOM: - drawLine(canvas, view.getTop() - topMargin, view.getBottom() + bottomMargin); - drawMarkerOrCircle(canvas, view, customMarker, customMarkerRadius); - break; - } - } - } - - private void drawDivider(Canvas canvas, View view, int right) { - canvas.drawRect(dividerPaddingLeft, view.getBottom() - dividerHeight, - right - dividerPaddingRight, view.getBottom(), dividerPaint); - } - - private void drawLine(Canvas canvas, float top, float bottom) { - canvas.drawRect(leftDistance, top, leftDistance + lineWidth, bottom, linePaint); - } - - private void drawMarkerOrCircle(Canvas canvas, View view, Drawable marker, int radius) { - if (marker != null) - drawMarker(canvas, view, marker, radius); - else - drawCircle(canvas, view); - } - - private void drawCircle(Canvas canvas, View view) { - canvas.drawCircle(leftDistance + lineWidth / 2, view.getTop() + topDistance + markerRadius * 2, - markerRadius, markerPaint); - } - - private void drawMarker(Canvas canvas, View view, Drawable marker, int radius) { - marker.setBounds(leftDistance + lineWidth / 2 - radius, view.getTop() + topDistance, - leftDistance + lineWidth / 2 + radius, view.getTop() + topDistance + radius * 2); - marker.draw(canvas); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index 1d68cad..8e43a0e 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,6 @@ package com.casic.dcms.utils; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -16,67 +14,6 @@ private static SimpleDateFormat dateFormat; /** - * 获取年月区间,[2022-02-01,2022-02-28] - */ - public static String[] timestampToMonth(long millSeconds) throws ParseException { - dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); - //先判断是否在当月 - if (isInThisMonth(millSeconds)) { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得本月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - date.setTime(millSeconds); - String currentDay = dateFormat.format(date); - return new String[]{firstDay, currentDay}; - } else { - String dateValue = dateFormat.format(new Date(millSeconds)); - Date date = dateFormat.parse(dateValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //获得月第一天 - calendar.add(Calendar.MONTH, 0); - calendar.set(Calendar.DAY_OF_MONTH, 1); - String firstDay = dateFormat.format(calendar.getTime()); - - int year = calendar.get(Calendar.YEAR); - int m = calendar.get(Calendar.MONTH) + 1; - String month; - if (m < 10) { - month = "0" + m; - } else { - month = String.valueOf(m); - } - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - return new String[]{firstDay, year + "-" + month + "-" + maxDay}; - } - } - - /** - * 判断时间是否在本月之内 - */ - public static boolean isInThisMonth(long millSeconds) { - //所选时间对应的月份 - SimpleDateFormat dateFormat = new SimpleDateFormat("MM", Locale.CHINA); - String selectedMonth = dateFormat.format(new Date(millSeconds)); - //系统时间对应的月份 - String systemMonth = dateFormat.format(new Date(System.currentTimeMillis())); - return selectedMonth.equals(systemMonth); - } - - /** - * 时间戳转年月 - */ - public static String timestampToYearMonth(long millSeconds) { - dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA); - return dateFormat.format(new Date(millSeconds)); - } - - /** * 时间戳转时分 */ public static String minuteToTime(long millSeconds) { diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java deleted file mode 100644 index 154b9aa..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ViewGroupHub.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.dcms.utils; - -import android.app.Activity; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.fragment.app.Fragment; - -import com.gyf.immersionbar.ImmersionBar; -import com.pengxh.androidx.lite.kit.ContextKit; -import com.pengxh.androidx.lite.kit.IntKit; - -public class ViewGroupHub { - public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(activity) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(activity, color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(activity); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } - - public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { - ImmersionBar.with(fragment) - .statusBarDarkFont(isDarkFont) - .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) - .init(); - //根据不同设备状态栏高度设置statusBarView高度 - int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); - viewGroup.setPadding(0, statusBarHeight, 0, 0); - viewGroup.requestLayout(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java new file mode 100644 index 0000000..29dfc64 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/utils/ViewGroupKit.java @@ -0,0 +1,35 @@ +package com.casic.dcms.utils; + +import android.app.Activity; +import android.view.ViewGroup; + +import androidx.annotation.ColorRes; +import androidx.fragment.app.Fragment; + +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.kit.ContextKit; +import com.pengxh.androidx.lite.kit.IntKit; + +public class ViewGroupKit { + public static void initImmersionBar(ViewGroup viewGroup, Activity activity, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(activity, color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(activity); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } + + public static void initImmersionBar(ViewGroup viewGroup, Fragment fragment, boolean isDarkFont, @ColorRes int color) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(IntKit.convertColor(fragment.requireContext(), color)) + .init(); + //根据不同设备状态栏高度设置statusBarView高度 + int statusBarHeight = ContextKit.getStatusBarHeight(fragment.requireContext()); + viewGroup.setPadding(0, statusBarHeight, 0, 0); + viewGroup.requestLayout(); + } +} diff --git a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java index 4182661..efeeaf4 100644 --- a/app/src/main/java/com/casic/dcms/view/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BigImageActivity.java @@ -16,7 +16,7 @@ import com.bumptech.glide.Glide; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityBigImageBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.luck.picture.lib.photoview.PhotoView; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.Constant; @@ -27,7 +27,7 @@ @Override public void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.black); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.black); binding.leftBackView.setOnClickListener(view -> finish()); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e4377e4..1ab5e7d 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 77fed79..72b1682 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseProcessBinding; import com.casic.dcms.model.CaseProcessBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -32,7 +32,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("处理记录"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index fbc78a5..e5627b6 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityCaseListBinding; import com.casic.dcms.model.CaseSearchResultBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查询结果"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index bd32459..9d9e65f 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ComSentenceBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; import com.casic.dcms.vm.CommonDataViewModel; @@ -52,7 +52,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index bd2ec44..99caf00 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 14db6a2..6d4bb36 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("修改密码"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java index 45f766f..4fc3de2 100644 --- a/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/view/HelpfulActivity.java @@ -6,7 +6,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityHelpBinding; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; /** @@ -18,7 +18,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("帮助中心"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 87b179b..5b61ccd 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -34,7 +34,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.MapConfigViewModel; import com.casic.dcms.vm.PushViewModel; import com.casic.dcms.vm.ToiletViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); + ViewGroupKit.initImmersionBar(binding.rootView, this, false, R.color.mainThemeColor); ImmersionBar.with(this).statusBarDarkFont(false).init(); binding.titleView.setText("首页"); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index eceaf67..d5bf7b3 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("超时督办"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index 044979c..bdd4bc2 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; import com.pengxh.androidx.lite.kit.ObjectKit; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 10b3357..a983cc7 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.model.CaseStatusBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.CommonDataViewModel; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; @@ -43,7 +43,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查询"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java index ebabd18..8d179b5 100644 --- a/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/UrgentCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.urgent.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("紧急要件"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 76d3dd6..5a36f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.BridgeConfigBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.BridgeViewModel; @@ -46,7 +46,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index 629c75f..e468b93 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityMaintainRecordBinding; import com.casic.dcms.model.MaintainRecordBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.BridgeViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 01feebb..1a36d9f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -78,7 +78,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 068f3fb..876272e 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.business.PackageTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index d33a6f8..042d19d 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -37,7 +37,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 718dcbf..17a824f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; @@ -70,7 +70,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("待办案卷"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java index fdd2200..ca8f886 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index ab389e5..5e9cc00 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -74,7 +74,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 8589ac7..63acc74 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -49,7 +49,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核查详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 326b5e7..64f6c86 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -65,7 +65,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[3]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 32c958c..e8a8cf2 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -67,7 +67,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.DEPT_PAGE_TITLES[4]); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 5d6d3f1..11931ab 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.fragment.department.DeptCaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.widget.TitleBarView; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 165c7a7..0155f1c 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -19,7 +19,7 @@ import com.casic.dcms.model.ProcessPersonBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; import com.casic.dcms.vm.CaseViewModel; @@ -64,7 +64,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 97e0d67..bcd3246 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseOperateViewModel; @@ -75,7 +75,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); String title = getIntent().getStringExtra("title"); binding.titleBarLayout.titleView.setText(title); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 263cff5..9425bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.CaseProcessActivity; import com.casic.dcms.vm.CaseViewModel; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index efb54c1..5b86fcd 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -12,7 +12,7 @@ import com.casic.dcms.fragment.handle.CaseHandledFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; import com.casic.dcms.utils.LinearLayoutHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -24,7 +24,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷处理"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index f34ef34..a8f7e74 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.utils.HttpRequestManager; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ICommunityListener; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -87,7 +87,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("选择点位"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e42e6c5..e9c2fa8 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.model.VerifyCaseModel; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.CaseDetailActivity; import com.casic.dcms.vm.CaseViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -66,7 +66,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 0c2dcbb..862d726 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -15,7 +15,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; @@ -40,7 +40,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("位置查看"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 1cb3fc2..c088b42 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -57,7 +57,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("查看位置"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 3654fde..e2e6656 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellAlarmListBean; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.widgets.CancelAlarmDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -56,7 +56,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java index 1b2a970..66a38d0 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WarningOnMapActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.AlarmViewModel; import com.casic.dcms.vm.WellViewModel; import com.esri.arcgisruntime.geometry.Point; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index f114534..cfaa8bf 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -21,7 +21,7 @@ import com.casic.dcms.model.WellListBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.MapHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WellViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -55,7 +55,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index 14352aa..dfeed2b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -42,7 +42,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(1)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -93,7 +93,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, CaseResourceBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 4c5ca87..abe27ab 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.model.CityBaseDataBean; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -28,7 +28,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(0)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index f3b24df..5349a68 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -11,7 +11,7 @@ import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.kit.ContextKit; @@ -29,7 +29,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("统计分析"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index d154820..5e846ec 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityDeptHandleConditionBinding; import com.casic.dcms.model.DeptHandleConditionBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(3)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -103,7 +103,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 9dbcc25..7049254 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.adapter.NormalRecyclerAdapter; import com.casic.dcms.databinding.ActivityGridAnalysisBinding; import com.casic.dcms.model.GridAnalysisBean; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(4)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -73,7 +73,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, GridAnalysisBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); int rate = (int) ((Float.parseFloat(item.getRegisteredNum()) / finalCaseCount) * 100); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 6a45023..fb22182 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -15,10 +15,10 @@ import com.casic.dcms.databinding.ActivityHighEventBinding; import com.casic.dcms.model.HighEventBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.PieEntry; @@ -48,7 +48,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(2)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -118,7 +118,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, RegroupHighEventBean item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index 4acf271..cb9389b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -16,10 +16,10 @@ import com.casic.dcms.model.PunishRankingBean; import com.casic.dcms.model.PunishTypeStatisticBean; import com.casic.dcms.utils.ChartViewHelper; -import com.casic.dcms.utils.ColorHub; +import com.casic.dcms.utils.ColorKit; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.BarEntry; @@ -41,7 +41,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(6)); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -72,7 +72,7 @@ @Override public void convertView(ViewHolder viewHolder, int position, PunishRankingBean.DataModel item) { //设置随机颜色 - int[] color = ColorHub.generateColor(context); + int[] color = ColorKit.generateColor(context); viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1)) .setBackgroundColor(R.id.numberTagView, color[0]) diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index e48dd7c..b714457 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -14,7 +14,7 @@ import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.DataAnalysisViewModel; import com.casic.dcms.widgets.RangeDateActionSheet; import com.github.mikephil.charting.data.Entry; @@ -34,7 +34,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.leftBackView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index 446defc..8bf3e3f 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LampBoxDetailBean; import com.casic.dcms.model.LampBoxListBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.LampBoxViewModel; import com.casic.dcms.widgets.LightDetailDialog; import com.pengxh.androidx.lite.adapter.ViewHolder; @@ -50,7 +50,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java index 32d2abd..7738627 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxOnMapActivity.java @@ -28,7 +28,7 @@ import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.LocationHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.vm.LampBoxViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; @@ -73,7 +73,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index cd0dd1e..cd66472 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.WorkerOnMapActivity; @@ -54,7 +54,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 9232e98..98a7d7b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; @@ -72,7 +72,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index 074512f..4bf22a1 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.model.CaseSmallTypeBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -96,7 +96,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("快速上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index e796554..cb4f727 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -24,7 +24,7 @@ import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -89,7 +89,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("三包上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 3fbbf52..04ae27f 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -41,7 +41,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -133,7 +133,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷上报"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 3be4dfa..1f829b4 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -17,7 +17,7 @@ import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.vm.CaseViewModel; import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; @@ -47,7 +47,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷详情"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java index 03d2e42..b00213a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyCaseActivity.java @@ -13,7 +13,7 @@ import com.casic.dcms.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import java.util.ArrayList; @@ -23,7 +23,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核实"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 439f5ac..28e9fea 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.utils.MapHelper; import com.casic.dcms.utils.PictureSelectorHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.utils.callback.ISelectorListener; import com.casic.dcms.view.BigImageActivity; import com.casic.dcms.view.map.ArcGISMapActivity; @@ -114,7 +114,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleBarLayout.titleView.setText("案卷核实"); binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/worker/OnLineWorkerActivity.java b/app/src/main/java/com/casic/dcms/view/worker/OnLineWorkerActivity.java index 56b30e0..86f5d25 100644 --- a/app/src/main/java/com/casic/dcms/view/worker/OnLineWorkerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/worker/OnLineWorkerActivity.java @@ -23,7 +23,7 @@ import com.casic.dcms.model.WorkerBean; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.LocaleConstant; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WorkerViewModel; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; @@ -60,7 +60,7 @@ @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { diff --git a/app/src/main/java/com/casic/dcms/view/worker/WorkerListActivity.java b/app/src/main/java/com/casic/dcms/view/worker/WorkerListActivity.java index 981e010..5838aca 100644 --- a/app/src/main/java/com/casic/dcms/view/worker/WorkerListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/worker/WorkerListActivity.java @@ -7,11 +7,11 @@ import androidx.lifecycle.ViewModelProvider; import com.casic.dcms.R; -import com.casic.dcms.adapter.PersonListAdapter; +import com.casic.dcms.adapter.WorkerAdapter; import com.casic.dcms.databinding.ActivityWorkerListBinding; import com.casic.dcms.model.PersonBean; import com.casic.dcms.model.WorkerBean; -import com.casic.dcms.utils.ViewGroupHub; +import com.casic.dcms.utils.ViewGroupKit; import com.casic.dcms.vm.WorkerViewModel; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.utils.LoadState; @@ -28,12 +28,12 @@ private final Set deptSet = new HashSet<>(); private final List> deptAndPersons = new ArrayList<>(); //个人信息集合的集合 private WorkerViewModel workerViewModel; - private PersonListAdapter onlinePersonAdapter; + private WorkerAdapter onlinePersonAdapter; private List deptList = new ArrayList<>(); //部门名集合 @Override protected void setupTopBarLayout() { - ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + ViewGroupKit.initImmersionBar(binding.rootView, this, true, R.color.white); binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { @Override public void onLeftClick() { @@ -49,7 +49,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { - onlinePersonAdapter = new PersonListAdapter(this); + onlinePersonAdapter = new WorkerAdapter(this); workerViewModel = new ViewModelProvider(this).get(WorkerViewModel.class); workerViewModel.workerModel.observe(this, new Observer() {