增加列表详情页面

app/src/main/java/com/phlx/anchorcollect/Configs.java

@@ -103,6 +103,10 @@ public class Configs {
     //临时存放列表查询unid
     public static String tempUnid = "";
 
+    //首页fragment标签
+    public static int mainPosition;
+    public static String resumeId;
+
 //    public static boolean ISCONNECTED;
 
     public static String packageName(Context context) {

app/src/main/java/com/phlx/anchorcollect/data/Repository.java

@@ -10,6 +10,7 @@ import com.phlx.anchorcollect.entity.BreedingRecordEntity;
 import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenData;
+import com.phlx.anchorcollect.entity.ImmuneBatchDetailEntity;
 import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
 import com.phlx.anchorcollect.entity.LoginData;
 import com.phlx.anchorcollect.entity.MedicalRecordEntity;
@@ -171,6 +172,21 @@ public class Repository extends BaseModel implements HttpDataSource, LocalDataSo
         return mHttpDataSource.uploadImmuneBatchList(body);
     }
 
+    @Override
+    public Observable<ListResponse<ImmuneBatchDetailEntity>> downloadImmuneBatchDetailList(Map<String, String> map) {
+        return mHttpDataSource.downloadImmuneBatchDetailList(map);
+    }
+
+    @Override
+    public Observable<CollectResponse> downloadImmuneBatchDetailListSync(RequestBody body) {
+        return mHttpDataSource.downloadImmuneBatchDetailListSync(body);
+    }
+
+    @Override
+    public Observable<CollectResponse> uploadImmuneBatchDetailList(RequestBody body) {
+        return mHttpDataSource.uploadImmuneBatchDetailList(body);
+    }
+
     /****************************************************************************/
 
     @Override

app/src/main/java/com/phlx/anchorcollect/data/http/ApiService.java

@@ -7,6 +7,7 @@ import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenData;
 import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
+import com.phlx.anchorcollect.entity.ImmuneBatchDetailEntity;
 import com.phlx.anchorcollect.entity.LoginData;
 import com.phlx.anchorcollect.entity.MedicalRecordEntity;
 import com.phlx.anchorcollect.entity.PerformanceEntity;
@@ -212,6 +213,28 @@ public interface ApiService {
     @POST("/api/immunebatch/add")
     Observable<CollectResponse> uploadImmuneBatchList(@Body RequestBody body);
 
+    /**
+     * 获取-免疫记录-子表-列表
+     * SyncState 0根据记录更新，1重新更新
+     */
+    @FormUrlEncoded
+    @POST("/api/immunebatchDetail/list")
+    Observable<ListResponse<ImmuneBatchDetailEntity>> downloadImmuneBatchDetailList(@FieldMap Map<String, String> map);
+
+    /**
+     * 获取-免疫记录-子表-列表-返回
+     */
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @POST("/api/immunebatchDetail/sync/add")
+    Observable<CollectResponse> downloadImmuneBatchDetailListSync(@Body RequestBody body);
+
+    /**
+     * 上传-免疫记录-子表-列表
+     */
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @POST("/api/immunebatchDetail/add")
+    Observable<CollectResponse> uploadImmuneBatchDetailList(@Body RequestBody body);
+
 
 
 

app/src/main/java/com/phlx/anchorcollect/data/http/HttpDataSource.java

@@ -6,6 +6,7 @@ import com.phlx.anchorcollect.entity.BreedingRecordEntity;
 import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenData;
+import com.phlx.anchorcollect.entity.ImmuneBatchDetailEntity;
 import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
 import com.phlx.anchorcollect.entity.LoginData;
 import com.phlx.anchorcollect.entity.MedicalRecordEntity;
@@ -161,4 +162,20 @@ public interface HttpDataSource {
      * 上传-免疫记录-列表
      */
     Observable<CollectResponse> uploadImmuneBatchList(@Body RequestBody body);
+
+    /**
+     * 获取-免疫记录-子表-列表
+     * SyncState 0根据记录更新，1重新更新
+     */
+    Observable<ListResponse<ImmuneBatchDetailEntity>> downloadImmuneBatchDetailList(@FieldMap Map<String, String> map);
+
+    /**
+     * 获取-免疫记录-子表-列表-返回
+     */
+    Observable<CollectResponse> downloadImmuneBatchDetailListSync(@Body RequestBody body);
+
+    /**
+     * 上传-免疫记录-子表-列表
+     */
+    Observable<CollectResponse> uploadImmuneBatchDetailList(@Body RequestBody body);
 }

app/src/main/java/com/phlx/anchorcollect/data/http/HttpDataSourceImpl.java

@@ -6,6 +6,7 @@ import com.phlx.anchorcollect.entity.BreedingRecordEntity;
 import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenData;
+import com.phlx.anchorcollect.entity.ImmuneBatchDetailEntity;
 import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
 import com.phlx.anchorcollect.entity.LoginData;
 import com.phlx.anchorcollect.entity.MedicalRecordEntity;
@@ -162,4 +163,19 @@ public class HttpDataSourceImpl implements HttpDataSource {
     public Observable<CollectResponse> uploadImmuneBatchList(RequestBody body) {
         return apiService.uploadImmuneBatchList(body);
     }
+
+    @Override
+    public Observable<ListResponse<ImmuneBatchDetailEntity>> downloadImmuneBatchDetailList(Map<String, String> map) {
+        return apiService.downloadImmuneBatchDetailList(map);
+    }
+
+    @Override
+    public Observable<CollectResponse> downloadImmuneBatchDetailListSync(RequestBody body) {
+        return apiService.downloadImmuneBatchDetailListSync(body);
+    }
+
+    @Override
+    public Observable<CollectResponse> uploadImmuneBatchDetailList(RequestBody body) {
+        return apiService.uploadImmuneBatchDetailList(body);
+    }
 }

app/src/main/java/com/phlx/anchorcollect/db/MyOpenHelper.java

@@ -6,7 +6,6 @@ import android.database.sqlite.SQLiteDatabase;
 import com.github.yuweiguocn.library.greendao.MigrationHelper;
 import com.phlx.anchorcollect.db.gen.CardEntityDao;
 import com.phlx.anchorcollect.db.gen.DaoMaster;
-import com.phlx.anchorcollect.entity.CardEntity;
 
 import org.greenrobot.greendao.database.Database;
 

app/src/main/java/com/phlx/anchorcollect/db/gen/AncestryinfoEntityDao.java

-package com.phlx.anchorcollect.db.gen;
-
-import android.database.Cursor;
-import android.database.sqlite.SQLiteStatement;
-
-import org.greenrobot.greendao.AbstractDao;
-import org.greenrobot.greendao.Property;
-import org.greenrobot.greendao.internal.DaoConfig;
-import org.greenrobot.greendao.database.Database;
-import org.greenrobot.greendao.database.DatabaseStatement;
-
-import com.phlx.anchorcollect.entity.AncestryinfoEntity;
-
-// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
-/** 
- * DAO for table "ANCESTRYINFO_ENTITY".
-*/
-public class AncestryinfoEntityDao extends AbstractDao<AncestryinfoEntity, Long> {
-
-    public static final String TABLENAME = "ANCESTRYINFO_ENTITY";
-
-    /**
-     * Properties of entity AncestryinfoEntity.<br/>
-     * Can be used for QueryBuilder and for referencing column names.
-     */
-    public static class Properties {
-        public final static Property Id = new Property(0, Long.class, "id", true, "_id");
-        public final static Property Ancestryid = new Property(1, String.class, "ancestryid", false, "ANCESTRYID");
-        public final static Property Ancestryname = new Property(2, String.class, "ancestryname", false, "ANCESTRYNAME");
-        public final static Property Remark = new Property(3, String.class, "remark", false, "REMARK");
-        public final static Property Timestamp = new Property(4, long.class, "timestamp", false, "TIMESTAMP");
-    }
-
-
-    public AncestryinfoEntityDao(DaoConfig config) {
-        super(config);
-    }
-    
-    public AncestryinfoEntityDao(DaoConfig config, DaoSession daoSession) {
-        super(config, daoSession);
-    }
-
-    /** Creates the underlying database table. */
-    public static void createTable(Database db, boolean ifNotExists) {
-        String constraint = ifNotExists? "IF NOT EXISTS ": "";
-        db.execSQL("CREATE TABLE " + constraint + "\"ANCESTRYINFO_ENTITY\" (" + //
-                "\"_id\" INTEGER PRIMARY KEY ," + // 0: id
-                "\"ANCESTRYID\" TEXT," + // 1: ancestryid
-                "\"ANCESTRYNAME\" TEXT," + // 2: ancestryname
-                "\"REMARK\" TEXT," + // 3: remark
-                "\"TIMESTAMP\" INTEGER NOT NULL );"); // 4: timestamp
-        // Add Indexes
-        db.execSQL("CREATE INDEX " + constraint + "ancestryTime ON \"ANCESTRYINFO_ENTITY\"" +
-                " (\"TIMESTAMP\" ASC);");
-    }
-
-    /** Drops the underlying database table. */
-    public static void dropTable(Database db, boolean ifExists) {
-        String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ANCESTRYINFO_ENTITY\"";
-        db.execSQL(sql);
-    }
-
-    @Override
-    protected final void bindValues(DatabaseStatement stmt, AncestryinfoEntity entity) {
-        stmt.clearBindings();
- 
-        Long id = entity.getId();
-        if (id != null) {
-            stmt.bindLong(1, id);
-        }
- 
-        String ancestryid = entity.getAncestryid();
-        if (ancestryid != null) {
-            stmt.bindString(2, ancestryid);
-        }
- 
-        String ancestryname = entity.getAncestryname();
-        if (ancestryname != null) {
-            stmt.bindString(3, ancestryname);
-        }
- 
-        String remark = entity.getRemark();
-        if (remark != null) {
-            stmt.bindString(4, remark);
-        }
-        stmt.bindLong(5, entity.getTimestamp());
-    }
-
-    @Override
-    protected final void bindValues(SQLiteStatement stmt, AncestryinfoEntity entity) {
-        stmt.clearBindings();
- 
-        Long id = entity.getId();
-        if (id != null) {
-            stmt.bindLong(1, id);
-        }
- 
-        String ancestryid = entity.getAncestryid();
-        if (ancestryid != null) {
-            stmt.bindString(2, ancestryid);
-        }
- 
-        String ancestryname = entity.getAncestryname();
-        if (ancestryname != null) {
-            stmt.bindString(3, ancestryname);
-        }
- 
-        String remark = entity.getRemark();
-        if (remark != null) {
-            stmt.bindString(4, remark);
-        }
-        stmt.bindLong(5, entity.getTimestamp());
-    }
-
-    @Override
-    public Long readKey(Cursor cursor, int offset) {
-        return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0);
-    }    
-
-    @Override
-    public AncestryinfoEntity readEntity(Cursor cursor, int offset) {
-        AncestryinfoEntity entity = new AncestryinfoEntity( //
-            cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id
-            cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // ancestryid
-            cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // ancestryname
-            cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // remark
-            cursor.getLong(offset + 4) // timestamp
-        );
-        return entity;
-    }
-     
-    @Override
-    public void readEntity(Cursor cursor, AncestryinfoEntity entity, int offset) {
-        entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0));
-        entity.setAncestryid(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1));
-        entity.setAncestryname(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2));
-        entity.setRemark(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3));
-        entity.setTimestamp(cursor.getLong(offset + 4));
-     }
-    
-    @Override
-    protected final Long updateKeyAfterInsert(AncestryinfoEntity entity, long rowId) {
-        entity.setId(rowId);
-        return rowId;
-    }
-    
-    @Override
-    public Long getKey(AncestryinfoEntity entity) {
-        if(entity != null) {
-            return entity.getId();
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public boolean hasKey(AncestryinfoEntity entity) {
-        return entity.getId() != null;
-    }
-
-    @Override
-    protected final boolean isEntityUpdateable() {
-        return true;
-    }
-    
-}

app/src/main/java/com/phlx/anchorcollect/db/gen/DaoMaster.java

@@ -29,11 +29,12 @@ public class DaoMaster extends AbstractDaoMaster {
         DictEntityDao.createTable(db, ifNotExists);
         GenTableDao.createTable(db, ifNotExists);
         GenTableColumnDao.createTable(db, ifNotExists);
+        ImmuneBatchDetailEntityDao.createTable(db, ifNotExists);
+        ImmuneBatchEntityDao.createTable(db, ifNotExists);
+        MedicalRecordEntityDao.createTable(db, ifNotExists);
         PerformanceEntityDao.createTable(db, ifNotExists);
         UserRoleEntityDao.createTable(db, ifNotExists);
         WeightManEntityDao.createTable(db, ifNotExists);
-        ImmuneBatchEntityDao.createTable(db, ifNotExists);
-        MedicalRecordEntityDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
@@ -46,11 +47,12 @@ public class DaoMaster extends AbstractDaoMaster {
         DictEntityDao.dropTable(db, ifExists);
         GenTableDao.dropTable(db, ifExists);
         GenTableColumnDao.dropTable(db, ifExists);
+        ImmuneBatchDetailEntityDao.dropTable(db, ifExists);
+        ImmuneBatchEntityDao.dropTable(db, ifExists);
+        MedicalRecordEntityDao.dropTable(db, ifExists);
         PerformanceEntityDao.dropTable(db, ifExists);
         UserRoleEntityDao.dropTable(db, ifExists);
         WeightManEntityDao.dropTable(db, ifExists);
-        ImmuneBatchEntityDao.dropTable(db, ifExists);
-        MedicalRecordEntityDao.dropTable(db, ifExists);
     }
 
     /**
@@ -77,11 +79,12 @@ public class DaoMaster extends AbstractDaoMaster {
         registerDaoClass(DictEntityDao.class);
         registerDaoClass(GenTableDao.class);
         registerDaoClass(GenTableColumnDao.class);
+        registerDaoClass(ImmuneBatchDetailEntityDao.class);
+        registerDaoClass(ImmuneBatchEntityDao.class);
+        registerDaoClass(MedicalRecordEntityDao.class);
         registerDaoClass(PerformanceEntityDao.class);
         registerDaoClass(UserRoleEntityDao.class);
         registerDaoClass(WeightManEntityDao.class);
-        registerDaoClass(ImmuneBatchEntityDao.class);
-        registerDaoClass(MedicalRecordEntityDao.class);
     }
 
     public DaoSession newSession() {

app/src/main/java/com/phlx/anchorcollect/db/gen/DaoSession.java

@@ -16,11 +16,12 @@ import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenTable;
 import com.phlx.anchorcollect.entity.GenTableColumn;
+import com.phlx.anchorcollect.entity.ImmuneBatchDetailEntity;
+import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
+import com.phlx.anchorcollect.entity.MedicalRecordEntity;
 import com.phlx.anchorcollect.entity.PerformanceEntity;
 import com.phlx.anchorcollect.entity.UserRoleEntity;
 import com.phlx.anchorcollect.entity.WeightManEntity;
-import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
-import com.phlx.anchorcollect.entity.MedicalRecordEntity;
 
 import com.phlx.anchorcollect.db.gen.AncestryinfoEntityDao;
 import com.phlx.anchorcollect.db.gen.BreedingRecordDetailEntityDao;
@@ -30,11 +31,12 @@ import com.phlx.anchorcollect.db.gen.CattleResumeEntityDao;
 import com.phlx.anchorcollect.db.gen.DictEntityDao;
 import com.phlx.anchorcollect.db.gen.GenTableDao;
 import com.phlx.anchorcollect.db.gen.GenTableColumnDao;
+import com.phlx.anchorcollect.db.gen.ImmuneBatchDetailEntityDao;
+import com.phlx.anchorcollect.db.gen.ImmuneBatchEntityDao;
+import com.phlx.anchorcollect.db.gen.MedicalRecordEntityDao;
 import com.phlx.anchorcollect.db.gen.PerformanceEntityDao;
 import com.phlx.anchorcollect.db.gen.UserRoleEntityDao;
 import com.phlx.anchorcollect.db.gen.WeightManEntityDao;
-import com.phlx.anchorcollect.db.gen.ImmuneBatchEntityDao;
-import com.phlx.anchorcollect.db.gen.MedicalRecordEntityDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -53,11 +55,12 @@ public class DaoSession extends AbstractDaoSession {
     private final DaoConfig dictEntityDaoConfig;
     private final DaoConfig genTableDaoConfig;
     private final DaoConfig genTableColumnDaoConfig;
+    private final DaoConfig immuneBatchDetailEntityDaoConfig;
+    private final DaoConfig immuneBatchEntityDaoConfig;
+    private final DaoConfig medicalRecordEntityDaoConfig;
     private final DaoConfig performanceEntityDaoConfig;
     private final DaoConfig userRoleEntityDaoConfig;
     private final DaoConfig weightManEntityDaoConfig;
-    private final DaoConfig immuneBatchEntityDaoConfig;
-    private final DaoConfig medicalRecordEntityDaoConfig;
 
     private final AncestryinfoEntityDao ancestryinfoEntityDao;
     private final BreedingRecordDetailEntityDao breedingRecordDetailEntityDao;
@@ -67,11 +70,12 @@ public class DaoSession extends AbstractDaoSession {
     private final DictEntityDao dictEntityDao;
     private final GenTableDao genTableDao;
     private final GenTableColumnDao genTableColumnDao;
+    private final ImmuneBatchDetailEntityDao immuneBatchDetailEntityDao;
+    private final ImmuneBatchEntityDao immuneBatchEntityDao;
+    private final MedicalRecordEntityDao medicalRecordEntityDao;
     private final PerformanceEntityDao performanceEntityDao;
     private final UserRoleEntityDao userRoleEntityDao;
     private final WeightManEntityDao weightManEntityDao;
-    private final ImmuneBatchEntityDao immuneBatchEntityDao;
-    private final MedicalRecordEntityDao medicalRecordEntityDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
@@ -101,6 +105,15 @@ public class DaoSession extends AbstractDaoSession {
         genTableColumnDaoConfig = daoConfigMap.get(GenTableColumnDao.class).clone();
         genTableColumnDaoConfig.initIdentityScope(type);
 
+        immuneBatchDetailEntityDaoConfig = daoConfigMap.get(ImmuneBatchDetailEntityDao.class).clone();
+        immuneBatchDetailEntityDaoConfig.initIdentityScope(type);
+
+        immuneBatchEntityDaoConfig = daoConfigMap.get(ImmuneBatchEntityDao.class).clone();
+        immuneBatchEntityDaoConfig.initIdentityScope(type);
+
+        medicalRecordEntityDaoConfig = daoConfigMap.get(MedicalRecordEntityDao.class).clone();
+        medicalRecordEntityDaoConfig.initIdentityScope(type);
+
         performanceEntityDaoConfig = daoConfigMap.get(PerformanceEntityDao.class).clone();
         performanceEntityDaoConfig.initIdentityScope(type);
 
@@ -110,12 +123,6 @@ public class DaoSession extends AbstractDaoSession {
         weightManEntityDaoConfig = daoConfigMap.get(WeightManEntityDao.class).clone();
         weightManEntityDaoConfig.initIdentityScope(type);
 
-        immuneBatchEntityDaoConfig = daoConfigMap.get(ImmuneBatchEntityDao.class).clone();
-        immuneBatchEntityDaoConfig.initIdentityScope(type);
-
-        medicalRecordEntityDaoConfig = daoConfigMap.get(MedicalRecordEntityDao.class).clone();
-        medicalRecordEntityDaoConfig.initIdentityScope(type);
-
         ancestryinfoEntityDao = new AncestryinfoEntityDao(ancestryinfoEntityDaoConfig, this);
         breedingRecordDetailEntityDao = new BreedingRecordDetailEntityDao(breedingRecordDetailEntityDaoConfig, this);
         breedingRecordEntityDao = new BreedingRecordEntityDao(breedingRecordEntityDaoConfig, this);
@@ -124,11 +131,12 @@ public class DaoSession extends AbstractDaoSession {
         dictEntityDao = new DictEntityDao(dictEntityDaoConfig, this);
         genTableDao = new GenTableDao(genTableDaoConfig, this);
         genTableColumnDao = new GenTableColumnDao(genTableColumnDaoConfig, this);
+        immuneBatchDetailEntityDao = new ImmuneBatchDetailEntityDao(immuneBatchDetailEntityDaoConfig, this);
+        immuneBatchEntityDao = new ImmuneBatchEntityDao(immuneBatchEntityDaoConfig, this);
+        medicalRecordEntityDao = new MedicalRecordEntityDao(medicalRecordEntityDaoConfig, this);
         performanceEntityDao = new PerformanceEntityDao(performanceEntityDaoConfig, this);
         userRoleEntityDao = new UserRoleEntityDao(userRoleEntityDaoConfig, this);
         weightManEntityDao = new WeightManEntityDao(weightManEntityDaoConfig, this);
-        immuneBatchEntityDao = new ImmuneBatchEntityDao(immuneBatchEntityDaoConfig, this);
-        medicalRecordEntityDao = new MedicalRecordEntityDao(medicalRecordEntityDaoConfig, this);
 
         registerDao(AncestryinfoEntity.class, ancestryinfoEntityDao);
         registerDao(BreedingRecordDetailEntity.class, breedingRecordDetailEntityDao);
@@ -138,11 +146,12 @@ public class DaoSession extends AbstractDaoSession {
         registerDao(DictEntity.class, dictEntityDao);
         registerDao(GenTable.class, genTableDao);
         registerDao(GenTableColumn.class, genTableColumnDao);
+        registerDao(ImmuneBatchDetailEntity.class, immuneBatchDetailEntityDao);
+        registerDao(ImmuneBatchEntity.class, immuneBatchEntityDao);
+        registerDao(MedicalRecordEntity.class, medicalRecordEntityDao);
         registerDao(PerformanceEntity.class, performanceEntityDao);
         registerDao(UserRoleEntity.class, userRoleEntityDao);
         registerDao(WeightManEntity.class, weightManEntityDao);
-        registerDao(ImmuneBatchEntity.class, immuneBatchEntityDao);
-        registerDao(MedicalRecordEntity.class, medicalRecordEntityDao);
     }
     
     public void clear() {
@@ -154,11 +163,12 @@ public class DaoSession extends AbstractDaoSession {
         dictEntityDaoConfig.clearIdentityScope();
         genTableDaoConfig.clearIdentityScope();
         genTableColumnDaoConfig.clearIdentityScope();
+        immuneBatchDetailEntityDaoConfig.clearIdentityScope();
+        immuneBatchEntityDaoConfig.clearIdentityScope();
+        medicalRecordEntityDaoConfig.clearIdentityScope();
         performanceEntityDaoConfig.clearIdentityScope();
         userRoleEntityDaoConfig.clearIdentityScope();
         weightManEntityDaoConfig.clearIdentityScope();
-        immuneBatchEntityDaoConfig.clearIdentityScope();
-        medicalRecordEntityDaoConfig.clearIdentityScope();
     }
 
     public AncestryinfoEntityDao getAncestryinfoEntityDao() {
@@ -193,6 +203,18 @@ public class DaoSession extends AbstractDaoSession {
         return genTableColumnDao;
     }
 
+    public ImmuneBatchDetailEntityDao getImmuneBatchDetailEntityDao() {
+        return immuneBatchDetailEntityDao;
+    }
+
+    public ImmuneBatchEntityDao getImmuneBatchEntityDao() {
+        return immuneBatchEntityDao;
+    }
+
+    public MedicalRecordEntityDao getMedicalRecordEntityDao() {
+        return medicalRecordEntityDao;
+    }
+
     public PerformanceEntityDao getPerformanceEntityDao() {
         return performanceEntityDao;
     }
@@ -205,12 +227,4 @@ public class DaoSession extends AbstractDaoSession {
         return weightManEntityDao;
     }
 
-    public ImmuneBatchEntityDao getImmuneBatchEntityDao() {
-        return immuneBatchEntityDao;
-    }
-
-    public MedicalRecordEntityDao getMedicalRecordEntityDao() {
-        return medicalRecordEntityDao;
-    }
-
 }

app/src/main/java/com/phlx/anchorcollect/db/gen/UserRoleEntityDao.java

-package com.phlx.anchorcollect.db.gen;
-
-import android.database.Cursor;
-import android.database.sqlite.SQLiteStatement;
-
-import org.greenrobot.greendao.AbstractDao;
-import org.greenrobot.greendao.Property;
-import org.greenrobot.greendao.internal.DaoConfig;
-import org.greenrobot.greendao.database.Database;
-import org.greenrobot.greendao.database.DatabaseStatement;
-
-import com.phlx.anchorcollect.entity.UserRoleEntity;
-
-// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
-/** 
- * DAO for table "USER_ROLE_ENTITY".
-*/
-public class UserRoleEntityDao extends AbstractDao<UserRoleEntity, Void> {
-
-    public static final String TABLENAME = "USER_ROLE_ENTITY";
-
-    /**
-     * Properties of entity UserRoleEntity.<br/>
-     * Can be used for QueryBuilder and for referencing column names.
-     */
-    public static class Properties {
-        public final static Property RoleId = new Property(0, String.class, "roleId", false, "ROLE_ID");
-        public final static Property RoleName = new Property(1, String.class, "roleName", false, "ROLE_NAME");
-        public final static Property RoleKey = new Property(2, String.class, "roleKey", false, "ROLE_KEY");
-        public final static Property RoleSort = new Property(3, String.class, "roleSort", false, "ROLE_SORT");
-        public final static Property DataScope = new Property(4, String.class, "dataScope", false, "DATA_SCOPE");
-        public final static Property Status = new Property(5, String.class, "status", false, "STATUS");
-        public final static Property DelFlag = new Property(6, String.class, "delFlag", false, "DEL_FLAG");
-        public final static Property Flag = new Property(7, boolean.class, "flag", false, "FLAG");
-    }
-
-
-    public UserRoleEntityDao(DaoConfig config) {
-        super(config);
-    }
-    
-    public UserRoleEntityDao(DaoConfig config, DaoSession daoSession) {
-        super(config, daoSession);
-    }
-
-    /** Creates the underlying database table. */
-    public static void createTable(Database db, boolean ifNotExists) {
-        String constraint = ifNotExists? "IF NOT EXISTS ": "";
-        db.execSQL("CREATE TABLE " + constraint + "\"USER_ROLE_ENTITY\" (" + //
-                "\"ROLE_ID\" TEXT," + // 0: roleId
-                "\"ROLE_NAME\" TEXT," + // 1: roleName
-                "\"ROLE_KEY\" TEXT," + // 2: roleKey
-                "\"ROLE_SORT\" TEXT," + // 3: roleSort
-                "\"DATA_SCOPE\" TEXT," + // 4: dataScope
-                "\"STATUS\" TEXT," + // 5: status
-                "\"DEL_FLAG\" TEXT," + // 6: delFlag
-                "\"FLAG\" INTEGER NOT NULL );"); // 7: flag
-    }
-
-    /** Drops the underlying database table. */
-    public static void dropTable(Database db, boolean ifExists) {
-        String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"USER_ROLE_ENTITY\"";
-        db.execSQL(sql);
-    }
-
-    @Override
-    protected final void bindValues(DatabaseStatement stmt, UserRoleEntity entity) {
-        stmt.clearBindings();
- 
-        String roleId = entity.getRoleId();
-        if (roleId != null) {
-            stmt.bindString(1, roleId);
-        }
- 
-        String roleName = entity.getRoleName();
-        if (roleName != null) {
-            stmt.bindString(2, roleName);
-        }
- 
-        String roleKey = entity.getRoleKey();
-        if (roleKey != null) {
-            stmt.bindString(3, roleKey);
-        }
- 
-        String roleSort = entity.getRoleSort();
-        if (roleSort != null) {
-            stmt.bindString(4, roleSort);
-        }
- 
-        String dataScope = entity.getDataScope();
-        if (dataScope != null) {
-            stmt.bindString(5, dataScope);
-        }
- 
-        String status = entity.getStatus();
-        if (status != null) {
-            stmt.bindString(6, status);
-        }
- 
-        String delFlag = entity.getDelFlag();
-        if (delFlag != null) {
-            stmt.bindString(7, delFlag);
-        }
-        stmt.bindLong(8, entity.getFlag() ? 1L: 0L);
-    }
-
-    @Override
-    protected final void bindValues(SQLiteStatement stmt, UserRoleEntity entity) {
-        stmt.clearBindings();
- 
-        String roleId = entity.getRoleId();
-        if (roleId != null) {
-            stmt.bindString(1, roleId);
-        }
- 
-        String roleName = entity.getRoleName();
-        if (roleName != null) {
-            stmt.bindString(2, roleName);
-        }
- 
-        String roleKey = entity.getRoleKey();
-        if (roleKey != null) {
-            stmt.bindString(3, roleKey);
-        }
- 
-        String roleSort = entity.getRoleSort();
-        if (roleSort != null) {
-            stmt.bindString(4, roleSort);
-        }
- 
-        String dataScope = entity.getDataScope();
-        if (dataScope != null) {
-            stmt.bindString(5, dataScope);
-        }
- 
-        String status = entity.getStatus();
-        if (status != null) {
-            stmt.bindString(6, status);
-        }
- 
-        String delFlag = entity.getDelFlag();
-        if (delFlag != null) {
-            stmt.bindString(7, delFlag);
-        }
-        stmt.bindLong(8, entity.getFlag() ? 1L: 0L);
-    }
-
-    @Override
-    public Void readKey(Cursor cursor, int offset) {
-        return null;
-    }    
-
-    @Override
-    public UserRoleEntity readEntity(Cursor cursor, int offset) {
-        UserRoleEntity entity = new UserRoleEntity( //
-            cursor.isNull(offset + 0) ? null : cursor.getString(offset + 0), // roleId
-            cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // roleName
-            cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // roleKey
-            cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // roleSort
-            cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // dataScope
-            cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // status
-            cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // delFlag
-            cursor.getShort(offset + 7) != 0 // flag
-        );
-        return entity;
-    }
-     
-    @Override
-    public void readEntity(Cursor cursor, UserRoleEntity entity, int offset) {
-        entity.setRoleId(cursor.isNull(offset + 0) ? null : cursor.getString(offset + 0));
-        entity.setRoleName(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1));
-        entity.setRoleKey(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2));
-        entity.setRoleSort(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3));
-        entity.setDataScope(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4));
-        entity.setStatus(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5));
-        entity.setDelFlag(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6));
-        entity.setFlag(cursor.getShort(offset + 7) != 0);
-     }
-    
-    @Override
-    protected final Void updateKeyAfterInsert(UserRoleEntity entity, long rowId) {
-        // Unsupported or missing PK type
-        return null;
-    }
-    
-    @Override
-    public Void getKey(UserRoleEntity entity) {
-        return null;
-    }
-
-    @Override
-    public boolean hasKey(UserRoleEntity entity) {
-        // TODO
-        return false;
-    }
-
-    @Override
-    protected final boolean isEntityUpdateable() {
-        return true;
-    }
-    
-}

app/src/main/java/com/phlx/anchorcollect/entity/ImmuneBatchDetailEntity.java

+package com.phlx.anchorcollect.entity;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.databinding.BaseObservable;
+
+import org.greenrobot.greendao.annotation.Entity;
+import org.greenrobot.greendao.annotation.Id;
+import org.greenrobot.greendao.annotation.Generated;
+
+
+/**
+ * 免疫记录字对象 zxgl_immunebatch_detail
+ *
+ * @author phlx
+ * @date 2022-03-01
+ */
+@Entity
+public class ImmuneBatchDetailEntity extends BaseObservable implements Parcelable {
+
+    /**
+     * unid
+     */
+    @Id(autoincrement = false)
+    private String unid;
+
+    /**
+     * 基础信息unid
+     */
+    private String cattleresumeUnid;
+
+    /**
+     * 免疫记录unid
+     */
+    private String immunebatchUnid;
+
+    /**
+     * 部门id
+     */
+    private String deptId;
+
+
+    /** 是否上传 0未上传，1已上传 */
+    private String uploadStatus;
+
+    public ImmuneBatchDetailEntity() {
+    }
+
+    protected ImmuneBatchDetailEntity(Parcel in) {
+        unid = in.readString();
+        cattleresumeUnid = in.readString();
+        immunebatchUnid = in.readString();
+        deptId = in.readString();
+        uploadStatus = in.readString();
+    }
+
+    @Generated(hash = 1625164961)
+    public ImmuneBatchDetailEntity(String unid, String cattleresumeUnid, String immunebatchUnid, String deptId,
+            String uploadStatus) {
+        this.unid = unid;
+        this.cattleresumeUnid = cattleresumeUnid;
+        this.immunebatchUnid = immunebatchUnid;
+        this.deptId = deptId;
+        this.uploadStatus = uploadStatus;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(unid);
+        dest.writeString(cattleresumeUnid);
+        dest.writeString(immunebatchUnid);
+        dest.writeString(deptId);
+        dest.writeString(uploadStatus);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<ImmuneBatchDetailEntity> CREATOR = new Creator<ImmuneBatchDetailEntity>() {
+        @Override
+        public ImmuneBatchDetailEntity createFromParcel(Parcel in) {
+            return new ImmuneBatchDetailEntity(in);
+        }
+
+        @Override
+        public ImmuneBatchDetailEntity[] newArray(int size) {
+            return new ImmuneBatchDetailEntity[size];
+        }
+    };
+
+    public String getUnid() {
+        return unid;
+    }
+
+    public void setUnid(String unid) {
+        this.unid = unid;
+    }
+
+    public String getCattleresumeUnid() {
+        return cattleresumeUnid;
+    }
+
+    public void setCattleresumeUnid(String cattleresumeUnid) {
+        this.cattleresumeUnid = cattleresumeUnid;
+    }
+
+    public String getImmunebatchUnid() {
+        return immunebatchUnid;
+    }
+
+    public void setImmunebatchUnid(String immunebatchUnid) {
+        this.immunebatchUnid = immunebatchUnid;
+    }
+
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getUploadStatus() {
+        return uploadStatus;
+    }
+
+    public void setUploadStatus(String uploadStatus) {
+        this.uploadStatus = uploadStatus;
+    }
+
+    @Override
+    public String toString() {
+        return "ImmuneBatchDetailEntity{" +
+                "unid='" + unid + '\'' +
+                ", cattleresumeUnid='" + cattleresumeUnid + '\'' +
+                ", immunebatchUnid='" + immunebatchUnid + '\'' +
+                ", deptId='" + deptId + '\'' +
+                ", uploadStatus='" + uploadStatus + '\'' +
+                '}';
+    }
+}

app/src/main/java/com/phlx/anchorcollect/ui/fragment/BasicsCollectFragment.java

@@ -109,7 +109,7 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
         binding.tvWeighAdg.setTypeface(Configs.typeface);
         binding.tvWeighBwg.setTypeface(Configs.typeface);
 
-        binding.rvCollect.addItemDecoration(new SpaceItemDecoration(10));
+        binding.rvCollect.addItemDecoration(new SpaceItemDecoration(16));
 
         initTimePicker();
     }

app/src/main/java/com/phlx/anchorcollect/ui/fragment/PerformanceFragment.java

@@ -24,6 +24,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.listener.OnTimeSelectChangeListener;
 import com.bigkoo.pickerview.listener.OnTimeSelectListener;
 import com.bigkoo.pickerview.view.TimePickerView;
+import com.phlx.anchorcollect.Configs;
 import com.phlx.anchorcollect.R;
 import com.phlx.anchorcollect.data.VMFactory;
 import com.phlx.anchorcollect.databinding.FragmentPerformanceBinding;
@@ -43,6 +44,7 @@ import java.util.List;
 
 import io.reactivex.functions.Consumer;
 import me.goldze.mvvmhabit.base.BaseFragment;
+import me.goldze.mvvmhabit.utils.StringUtils;
 import me.goldze.mvvmhabit.utils.ToastUtils;
 import me.tatarka.bindingcollectionadapter2.BR;
 
@@ -328,4 +330,22 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
             }
         }
     }
+
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+
+        if (this != null && !hidden) {
+            viewModel.clearParamList();
+
+            //说明是列表跳转的
+            if(!StringUtils.isEmpty(Configs.resumeId)){
+                viewModel.queryPerformance();
+            }else{
+                //清除一下数据
+                binding.rvCollect.getAdapter().notifyDataSetChanged();
+            }
+        }
+    }
 }

app/src/main/java/com/phlx/anchorcollect/ui/fragment/vm/BasicsCollectVM.java

@@ -16,18 +16,15 @@ import com.phlx.anchorcollect.Configs;
 import com.phlx.anchorcollect.R;
 import com.phlx.anchorcollect.data.Repository;
 import com.phlx.anchorcollect.db.DbUtil;
-import com.phlx.anchorcollect.db.gen.CardEntityDao;
 import com.phlx.anchorcollect.db.gen.CattleResumeEntityDao;
 import com.phlx.anchorcollect.db.gen.DictEntityDao;
 import com.phlx.anchorcollect.db.interf.DbQueryCallBack;
-import com.phlx.anchorcollect.entity.CardEntity;
 import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenTableColumn;
 import com.phlx.anchorcollect.ui.fragment.list.CollectGridItem;
 import com.phlx.anchorcollect.ui.setting.SettingActivity;
 import com.phlx.anchorcollect.util.EntityUtils;
-import com.phlx.anchorcollect.util.StringUtil;
 
 import org.greenrobot.greendao.query.QueryBuilder;
 

app/src/main/java/com/phlx/anchorcollect/ui/fragment/vm/PerformanceVM.java

@@ -16,12 +16,20 @@ import com.phlx.anchorcollect.Configs;
 import com.phlx.anchorcollect.R;
 import com.phlx.anchorcollect.data.Repository;
 import com.phlx.anchorcollect.db.DbUtil;
+import com.phlx.anchorcollect.db.gen.BreedingRecordDetailEntityDao;
+import com.phlx.anchorcollect.db.gen.DictEntityDao;
+import com.phlx.anchorcollect.db.gen.PerformanceEntityDao;
 import com.phlx.anchorcollect.db.interf.DbIDUCallBack;
+import com.phlx.anchorcollect.db.interf.DbQueryCallBack;
+import com.phlx.anchorcollect.entity.BreedingRecordDetailEntity;
+import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenTableColumn;
 import com.phlx.anchorcollect.entity.PerformanceEntity;
 import com.phlx.anchorcollect.ui.fragment.list.CollectGridItem;
 import com.phlx.anchorcollect.util.EntityUtils;
 
+import org.greenrobot.greendao.query.QueryBuilder;
+
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -96,18 +104,74 @@ public class PerformanceVM extends BaseViewModel<Repository> {
         remarkParamEntity.setHtmlType("input");
         remarkParamEntity.setJavaType("String");
 
+    }
 
-        uuid = IdUtil.createSnowflake(3, 1).nextId();
+    private void initData(PerformanceEntity performanceEntity) {
+
+        //清除选中unid
+        Configs.resumeId = "";
+
+        String[] filedName = EntityUtils.getFiledName(performanceEntity);
+        for (String name : filedName) {
+
+            for (GenTableColumn gtc : Configs.performance) {
+
+                if (name.equals(gtc.getJavaField())) {
+                    try {
+                        Object fieldValueByName = EntityUtils.getFieldValueByName(name, performanceEntity);
+                        String value = fieldValueByName == null ? "" : fieldValueByName.toString();
+//                        Log.e("fieldValue:", "key:" + name + " | value:" + value);
+                        gtc.setContent(value);
+                        String showName = value;
+                        // 如果是选择的，查字典项
+                        if (!StringUtils.isEmpty(gtc.getDictType())) {
+                            QueryBuilder<DictEntity> builder =
+                                    DbUtil.getInstance().getQueryBuilder(DictEntity.class)
+                                            .where(DictEntityDao.Properties.DictType.eq(gtc.getDictType())
+                                                    , DictEntityDao.Properties.DictValue.eq(value));
+                            List<DictEntity> dictEntities = DbUtil.getInstance().queryAll(DictEntity.class, builder);
+                            if (dictEntities != null && dictEntities.size() > 0) {
+                                showName = dictEntities.get(0).getDictLabel();
+                            }
+                        }
+                        gtc.setShowName(showName);
+
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+            onNotifyAllEvent.setValue(false);
+        }
 
     }
 
-    public void initData(String tag) {
+    public void queryPerformance() {
 
-        uuid = IdUtil.createSnowflake(3, 1).nextId();
+        QueryBuilder<PerformanceEntity> builder =
+                DbUtil.getInstance().getQueryBuilder(PerformanceEntity.class)
+                        .where(PerformanceEntityDao.Properties.Unid.eq(Configs.resumeId));
+        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<PerformanceEntity>() {
+            @Override
+            public void onSuccess(List<PerformanceEntity> result) {
 
-        queryPerformance(tag);
-    }
+                if (result != null && result.size() > 0) {
+                    initData(result.get(0));
+                }
+            }
 
+            @Override
+            public void onFailed() {
+
+                //清除选中unid
+                Configs.resumeId = "";
+                onNotifyAllEvent.setValue(true);
+                ToastUtils.showShort("性能测定-数据库查询失败");
+            }
+        }).queryAsyncAll(PerformanceEntity.class, builder);
+
+    }
 
     public void onItemClick(GenTableColumn entity) {
 
@@ -140,9 +204,6 @@ public class PerformanceVM extends BaseViewModel<Repository> {
         onCardClickEvent.call();
     }
 
-    private void queryPerformance(String tag) {
-
-    }
 
     public BindingCommand onSaveClick = new BindingCommand(new BindingAction() {
         @Override
@@ -160,13 +221,20 @@ public class PerformanceVM extends BaseViewModel<Repository> {
 
         Gson gson = new Gson();
         PerformanceEntity performanceEntity = gson.fromJson(jsonObject, PerformanceEntity.class);
-        performanceEntity.setUnid(uuid + "");
-        performanceEntity.setUploadStatus("0");
-        performanceEntity.setDeptId(SPUtils.getInstance().getString(Configs.SP_DEPT_ID));
-        performanceEntity.setCreateBy(SPUtils.getInstance().getString(Configs.SP_LOGIN_NAME));
 
-        dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        performanceEntity.setCreateTime(dateFormat.format(new Date()));
+            dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (uuid == 0) {//新增
+            uuid = IdUtil.createSnowflake(3, 1).nextId();
+            performanceEntity.setUnid(uuid + "");
+            performanceEntity.setDeptId(SPUtils.getInstance().getString(Configs.SP_DEPT_ID));
+            performanceEntity.setCreateBy(SPUtils.getInstance().getString(Configs.SP_LOGIN_NAME));
+
+            performanceEntity.setCreateTime(dateFormat.format(new Date()));
+        }else{
+            performanceEntity.setUpdateBy(SPUtils.getInstance().getString(Configs.SP_LOGIN_NAME));
+            performanceEntity.setUpdateTime(dateFormat.format(new Date()));
+        }
+        performanceEntity.setUploadStatus("0");
 
         uploadData = new ArrayList<>();
         uploadData.add(performanceEntity);
@@ -195,7 +263,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
         remarkParamEntity.setShowName("");
         currentParamEntity = new GenTableColumn();
         uuid = IdUtil.createSnowflake(3, 1).nextId();
-        for (GenTableColumn gtc : Configs.cattleresume) {
+        for (GenTableColumn gtc : Configs.performance) {
             gtc.setShowName("");
             gtc.setContent("");
         }

app/src/main/java/com/phlx/anchorcollect/ui/login/LoginVM.java

@@ -20,7 +20,6 @@ import com.phlx.anchorcollect.entity.LoginData;
 import com.phlx.anchorcollect.entity.UserRoleEntity;
 import com.phlx.anchorcollect.net.NetworkUtils;
 import com.phlx.anchorcollect.params.CollectResponse;
-import com.phlx.anchorcollect.ui.home.HomeActivity;
 import com.phlx.anchorcollect.ui.main.MainActivity;
 import com.phlx.anchorcollect.ui.splash.SplashActivity;
 import com.phlx.anchorcollect.util.StringUtil;
@@ -28,8 +27,6 @@ import com.phlx.anchorcollect.util.TextUtil;
 
 import org.greenrobot.greendao.query.QueryBuilder;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;

app/src/main/java/com/phlx/anchorcollect/ui/main/MainActivity.java

@@ -33,7 +33,6 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
     private PerformanceFragment _performanceFragment;
     private BreedingRecordFragment _breedingRecordFragment;
 
-
     @Override
     public int initContentView(Bundle savedInstanceState) {
         return R.layout.activity_main;
@@ -47,12 +46,20 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
     @Override
     public void initParam() {
         super.initParam();
+
         Bundle mBundle = getIntent().getExtras();
         if (mBundle != null) {
             collectType = mBundle.getString("COLLECT_TYPT");
         }
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        labelSwitching(Configs.mainPosition);
+    }
+
     @Override
     public MainVM initViewModel() {
         VMFactory factory = VMFactory.getInstance(getApplication());
@@ -79,6 +86,8 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
             @Override
             public void onChanged(Integer integer) {
                 labelSwitching(integer);
+
+                Configs.mainPosition = integer;
             }
         });
     }
@@ -94,7 +103,7 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
         transaction.add(R.id.frameLayout, _performanceFragment);
         transaction.add(R.id.frameLayout, _breedingRecordFragment);
         transaction.commit();
-        labelSwitching(0);
+        labelSwitching(Configs.mainPosition);
     }
 
     public void labelSwitching(int position) {
@@ -112,6 +121,8 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
                 binding.tvTab0.setTextColor(getResources().getColor(R.color.colorPrimary));
                 break;
             case 1:
+                Bundle args = new Bundle();
+                args.putString("id", "-1");
                 transaction.show(_performanceFragment);
                 binding.tvTab1.setTextColor(getResources().getColor(R.color.colorPrimary));
                 break;

app/src/main/java/com/phlx/anchorcollect/ui/main/MainVM.java

@@ -8,25 +8,12 @@ import androidx.annotation.NonNull;
 import com.phlx.anchorcollect.Configs;
 import com.phlx.anchorcollect.data.Repository;
 import com.phlx.anchorcollect.db.DbUtil;
-import com.phlx.anchorcollect.db.gen.GenTableColumnDao;
-import com.phlx.anchorcollect.db.gen.GenTableDao;
 import com.phlx.anchorcollect.entity.DictEntity;
-import com.phlx.anchorcollect.entity.GenTable;
-import com.phlx.anchorcollect.entity.GenTableColumn;
-import com.phlx.anchorcollect.ui.base.BackBarVM;
 import com.phlx.anchorcollect.ui.base.MainBarVM;
-import com.phlx.anchorcollect.ui.fragment.CollectFragment;
-
-import org.greenrobot.greendao.query.QueryBuilder;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 import me.goldze.mvvmhabit.binding.command.BindingAction;
 import me.goldze.mvvmhabit.binding.command.BindingCommand;
 import me.goldze.mvvmhabit.bus.event.SingleLiveEvent;
-import me.goldze.mvvmhabit.utils.SPUtils;
 import me.goldze.mvvmhabit.utils.StringUtils;
 import me.goldze.mvvmhabit.utils.ToastUtils;
 
@@ -122,4 +109,5 @@ public class MainVM extends MainBarVM<Repository> {
             onTabClickEvent.setValue(5);
         }
     });
+
 }

app/src/main/java/com/phlx/anchorcollect/ui/splash/SplashVM.java

@@ -19,14 +19,12 @@ import com.phlx.anchorcollect.params.CollectResponse;
 import com.phlx.anchorcollect.params.ListResponse;
 import com.phlx.anchorcollect.params.PostParams;
 import com.phlx.anchorcollect.ui.base.MainBarVM;
-import com.phlx.anchorcollect.ui.home.HomeActivity;
 import com.phlx.anchorcollect.ui.main.MainActivity;
 import com.phlx.anchorcollect.util.StringUtil;
 
 import org.greenrobot.greendao.query.QueryBuilder;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import io.reactivex.functions.Consumer;

app/src/main/java/com/phlx/anchorcollect/util/EntityUtils.java

@@ -26,12 +26,11 @@ public class EntityUtils {
     }
 
     /**
-     *
-     * @Description 根据属性名 获取值（value）
      * @param name
      * @param user
      * @return
      * @throws IllegalAccessException
+     * @Description 根据属性名 获取值（value）
      */
     public static Object getFieldValueByName(String name, Object user) throws IllegalAccessException {
 
@@ -42,9 +41,9 @@ public class EntityUtils {
         Method method;
         Object value;
         try {
-                method = user.getClass().getMethod(getter, new Class[] {});
+            method = user.getClass().getMethod(getter, new Class[]{});
 
-            value = method.invoke(user, new CattleResumeEntity[] {});
+            value = method.invoke(user, new CattleResumeEntity[]{});
 
             return value;
         } catch (NoSuchMethodException e) {

app/src/main/res/layout/activity_setting.xml

@@ -224,7 +224,7 @@
                 android:text="@string/immun_record"
                 binding:layout_constraintTop_toBottomOf="@+id/btn_treatment_record_sync"
                 binding:layout_constraintLeft_toLeftOf="@+id/btn_base_archives_sync"
-                binding:layout_constraintBottom_toTopOf="@+id/btn_breeding_record_sync"
+                binding:layout_constraintBottom_toTopOf="@+id/btn_immun_record_detail_sync"
                 binding:onClickCommand="@{viewModel.OnImmunRecordSyncClickCommand}"
                 />
 
@@ -250,13 +250,47 @@
                 binding:layout_constraintBaseline_toBaselineOf="@+id/btn_immun_record_sync"
                 />
 
+            <!-- immun_record_detail -->
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_immun_record_detail_sync"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/immun_record_detail"
+                binding:layout_constraintTop_toBottomOf="@+id/btn_immun_record_sync"
+                binding:layout_constraintLeft_toLeftOf="@+id/btn_base_archives_sync"
+                binding:layout_constraintBottom_toTopOf="@+id/btn_breeding_record_sync"
+                binding:onClickCommand="@{viewModel.OnImmunRecordDetailSyncClickCommand}"
+                />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_immun_record_detail_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:text="(0)"
+                android:textColor="@color/white"
+                binding:layout_constraintLeft_toRightOf="@+id/btn_immun_record_detail_sync"
+                binding:layout_constraintBaseline_toBaselineOf="@+id/btn_immun_record_detail_sync"
+                />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_immun_record_detail_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:text="111"
+                android:textColor="@color/white"
+                binding:layout_constraintLeft_toRightOf="@+id/tv_immun_record_detail_count"
+                binding:layout_constraintBaseline_toBaselineOf="@+id/btn_immun_record_detail_sync"
+                />
+
             <!-- breeding_record -->
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_breeding_record_sync"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/breeding_record"
-                binding:layout_constraintTop_toBottomOf="@+id/btn_immun_record_sync"
+                binding:layout_constraintTop_toBottomOf="@+id/btn_immun_record_detail_sync"
                 binding:layout_constraintLeft_toLeftOf="@+id/btn_base_archives_sync"
                 binding:layout_constraintBottom_toTopOf="@+id/btn_breeding_record_detail_sync"
                 binding:onClickCommand="@{viewModel.OnBreedingRecordSyncClickCommand}"

app/src/main/res/values/strings.xml

@@ -22,6 +22,7 @@
     <string name="weighting_manage">称重管理</string>
     <string name="treatment_record">诊疗记录</string>
     <string name="immun_record">免疫记录</string>
+    <string name="immun_record_detail">免疫详情</string>
     <string name="breeding_record">配种记录</string>
     <string name="breeding_record_detail">配种详情</string>