Commit c0786e5e authored by chenyuling's avatar chenyuling

"修改班组信息"

parent 3b6d98d1
Pipeline #2284 failed with stages
...@@ -20,7 +20,7 @@ android { ...@@ -20,7 +20,7 @@ android {
minSdk 24 minSdk 24
targetSdk 32 targetSdk 32
versionCode 2 versionCode 2
versionName "2.0.1" versionName "2.0.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
......
...@@ -22,7 +22,7 @@ public class GroupConst { ...@@ -22,7 +22,7 @@ public class GroupConst {
//钢筋班组,木工班组,外架班组,防水班组,瓦工班组,安全文明施工,防水班组,众安管理人员,中交六公司管理人员,特种作业人员 //钢筋班组,木工班组,外架班组,防水班组,瓦工班组,安全文明施工,防水班组,众安管理人员,中交六公司管理人员,特种作业人员
public static ArrayList<Group2Bean> group2BeansConst = new ArrayList<>(); public static ArrayList<Group2Bean> group2BeansConst = new ArrayList<>();
static { static {
group2BeansConst.add(new Group2Bean(1, "钢筋班组",0)); /*group2BeansConst.add(new Group2Bean(1, "钢筋班组",0));
group2BeansConst.add(new Group2Bean(2, "木工班组",0)); group2BeansConst.add(new Group2Bean(2, "木工班组",0));
group2BeansConst.add(new Group2Bean(3, "外架班组",0)); group2BeansConst.add(new Group2Bean(3, "外架班组",0));
group2BeansConst.add(new Group2Bean(4, "防水班组",0)); group2BeansConst.add(new Group2Bean(4, "防水班组",0));
...@@ -31,6 +31,18 @@ public class GroupConst { ...@@ -31,6 +31,18 @@ public class GroupConst {
group2BeansConst.add(new Group2Bean(7, "防水班组",0)); group2BeansConst.add(new Group2Bean(7, "防水班组",0));
group2BeansConst.add(new Group2Bean(8, "众安管理人员",0)); group2BeansConst.add(new Group2Bean(8, "众安管理人员",0));
group2BeansConst.add(new Group2Bean(9, "中交六公司管理人员",0)); group2BeansConst.add(new Group2Bean(9, "中交六公司管理人员",0));
group2BeansConst.add(new Group2Bean(10, "特种作业人员",0)); group2BeansConst.add(new Group2Bean(10, "特种作业人员",0));*/
//建设单位,监理单位,总包单位,特种作业人员,钢筋班组,木工班组,水电班组,泥瓦班组,防水班组,其他人员
group2BeansConst.add(new Group2Bean(1, "建设单位",0));
group2BeansConst.add(new Group2Bean(2, "监理单位",0));
group2BeansConst.add(new Group2Bean(3, "总包单位",0));
group2BeansConst.add(new Group2Bean(4, "特种作业人员",0));
group2BeansConst.add(new Group2Bean(5, "钢筋班组",0));
group2BeansConst.add(new Group2Bean(6, "木工班组",0));
group2BeansConst.add(new Group2Bean(7, "水电班组",0));
group2BeansConst.add(new Group2Bean(8, "泥瓦班组",0));
group2BeansConst.add(new Group2Bean(9, "防水班组",0));
group2BeansConst.add(new Group2Bean(10, "其他人员",0));
} }
} }
...@@ -381,7 +381,8 @@ public class MainActivity extends BaseActivity implements OnTimeUpdateListener, ...@@ -381,7 +381,8 @@ public class MainActivity extends BaseActivity implements OnTimeUpdateListener,
if (passEntities != null) { if (passEntities != null) {
if (enterAdapter != null) { if (enterAdapter != null) {
int size = passEntities.size(); int size = passEntities.size();
if (enterBeans!=null&&size!=enterBeans.size()){ //&&size!=enterBeans.size()
if (enterBeans!=null){
//更新进出情况 //更新进出情况
//enterBeans = passEntities; 全局变量直接赋值会出现问题 //enterBeans = passEntities; 全局变量直接赋值会出现问题
enterBeans.clear(); enterBeans.clear();
...@@ -412,8 +413,8 @@ public class MainActivity extends BaseActivity implements OnTimeUpdateListener, ...@@ -412,8 +413,8 @@ public class MainActivity extends BaseActivity implements OnTimeUpdateListener,
if (passEntities != null) { if (passEntities != null) {
if (leaveAdapter != null) { if (leaveAdapter != null) {
int size = passEntities.size(); int size = passEntities.size();
//进出有变化时才更新 //进出有变化时才更新 &&size!=leaveBeans.size()
if (leaveBeans!=null&&size!=leaveBeans.size()){ if (leaveBeans!=null){
leaveBeans.clear(); leaveBeans.clear();
leaveBeans.addAll(passEntities); leaveBeans.addAll(passEntities);
//更新进出情况 //更新进出情况
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment