"修改班组信息"

app/build.gradle

@@ -20,7 +20,7 @@ android {
         minSdk 24
         targetSdk 32
         versionCode 2
-        versionName "2.0.1"
+        versionName "2.0.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/srthinker/statinfo/constant/GroupConst.java

@@ -22,7 +22,7 @@ public class GroupConst {
    //钢筋班组，木工班组，外架班组，防水班组，瓦工班组，安全文明施工，防水班组，众安管理人员，中交六公司管理人员，特种作业人员
    public static ArrayList<Group2Bean> group2BeansConst = new ArrayList<>();
    static {
-      group2BeansConst.add(new Group2Bean(1, "钢筋班组",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));
@@ -31,6 +31,18 @@ public class GroupConst {
       group2BeansConst.add(new Group2Bean(7, "防水班组",0));
       group2BeansConst.add(new Group2Bean(8, "众安管理人员",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));
    }
 }

app/src/main/java/com/srthinker/statinfo/uis/MainActivity.java

@@ -381,7 +381,8 @@ public class MainActivity extends BaseActivity implements OnTimeUpdateListener,
             if (passEntities != null) {
                 if (enterAdapter != null) {
                     int size = passEntities.size();
-                    if (enterBeans!=null&&size!=enterBeans.size()){
+                    //&&size!=enterBeans.size()
+                    if (enterBeans!=null){
                         //更新进出情况
                         //enterBeans = passEntities; 全局变量直接赋值会出现问题
                         enterBeans.clear();
@@ -412,8 +413,8 @@ public class MainActivity extends BaseActivity implements OnTimeUpdateListener,
             if (passEntities != null) {
                 if (leaveAdapter != null) {
                     int size = passEntities.size();
-                    //进出有变化时才更新
-                    if (leaveBeans!=null&&size!=leaveBeans.size()){
+                    //进出有变化时才更新 &&size!=leaveBeans.size()
+                    if (leaveBeans!=null){
                         leaveBeans.clear();
                         leaveBeans.addAll(passEntities);
                         //更新进出情况