1.修改登录后获取信息接口，增加了冻精数据获取；

2.基础信息保存后，自动查找父冻精的信息添加到系谱里；
3.修改保存数据库只能操作一个表，现在可以多表一起 操作；
4.优化了基础信息的数字输入判断，无法输入非法符号。

.gitignore

@@ -3,3 +3,10 @@
 !/.idea/
 !/.idea/deploymentTargetDropDown.xml
 
+!/.idea/libraries/
+!/.idea/modules/
+!/.idea/modules/AnchorCollect.iml
+!/.idea/modules/mycontrol/
+!/.idea/modules/mvvmhabit/
+!/.idea/modules/appupdateX/
+!/.idea/modules/app/

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.phlx.anchorcollect"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 19
-        versionName "2.2.0"
+        versionCode 20
+        versionName "2.2.1"
 
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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

@@ -7,6 +7,7 @@ import android.graphics.Typeface;
 
 import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
+import com.phlx.anchorcollect.entity.FrozenSemenEntity;
 import com.phlx.anchorcollect.entity.GenTableColumn;
 
 import java.util.ArrayList;
@@ -135,6 +136,8 @@ public class Configs {
     //字典项
     public static List<DictEntity> dictList = new ArrayList<>();
 
+    public static List<FrozenSemenEntity> frozenSemenList = new ArrayList<>();
+
     //临时存放列表查询可视耳标
     public static String tempTag = "";
     //临时存放列表查询电子耳标

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

@@ -14,6 +14,7 @@ import com.phlx.anchorcollect.entity.ImmuneBatchDetailEntity;
 import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
 import com.phlx.anchorcollect.entity.InspectEntity;
 import com.phlx.anchorcollect.entity.LoginData;
+import com.phlx.anchorcollect.entity.LoginInfoData;
 import com.phlx.anchorcollect.entity.MedicalRecordEntity;
 import com.phlx.anchorcollect.entity.PerformanceEntity;
 import com.phlx.anchorcollect.entity.WeightManEntity;
@@ -79,7 +80,7 @@ public class Repository extends BaseModel implements HttpDataSource, LocalDataSo
     }
 
     @Override
-    public Observable<ListResponse<DictEntity>> downloadDict() {
+    public Observable<CollectResponse<LoginInfoData>> downloadDict() {
         return mHttpDataSource.downloadDict();
     }
 

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

@@ -10,6 +10,7 @@ import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
 import com.phlx.anchorcollect.entity.ImmuneBatchDetailEntity;
 import com.phlx.anchorcollect.entity.InspectEntity;
 import com.phlx.anchorcollect.entity.LoginData;
+import com.phlx.anchorcollect.entity.LoginInfoData;
 import com.phlx.anchorcollect.entity.MedicalRecordEntity;
 import com.phlx.anchorcollect.entity.PerformanceEntity;
 import com.phlx.anchorcollect.entity.WeightManEntity;
@@ -65,7 +66,7 @@ public interface ApiService {
      * 获取字典项列表
      */
     @POST("/api/dict/data/list")
-    Observable<ListResponse<DictEntity>> downloadDict();
+    Observable<CollectResponse<LoginInfoData>> downloadDict();
 
     /**
      * 获取基础信息列表

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

@@ -10,6 +10,7 @@ import com.phlx.anchorcollect.entity.ImmuneBatchDetailEntity;
 import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
 import com.phlx.anchorcollect.entity.InspectEntity;
 import com.phlx.anchorcollect.entity.LoginData;
+import com.phlx.anchorcollect.entity.LoginInfoData;
 import com.phlx.anchorcollect.entity.MedicalRecordEntity;
 import com.phlx.anchorcollect.entity.PerformanceEntity;
 import com.phlx.anchorcollect.entity.WeightManEntity;
@@ -57,7 +58,7 @@ public interface HttpDataSource {
     /**
      * 获取字典项列表
      */
-    Observable<ListResponse<DictEntity>> downloadDict();
+    Observable<CollectResponse<LoginInfoData>> downloadDict();
 
     /**
      * 获取基础信息列表

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

@@ -10,6 +10,7 @@ import com.phlx.anchorcollect.entity.ImmuneBatchDetailEntity;
 import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
 import com.phlx.anchorcollect.entity.InspectEntity;
 import com.phlx.anchorcollect.entity.LoginData;
+import com.phlx.anchorcollect.entity.LoginInfoData;
 import com.phlx.anchorcollect.entity.MedicalRecordEntity;
 import com.phlx.anchorcollect.entity.PerformanceEntity;
 import com.phlx.anchorcollect.entity.WeightManEntity;
@@ -71,7 +72,7 @@ public class HttpDataSourceImpl implements HttpDataSource {
     }
 
     @Override
-    public Observable<ListResponse<DictEntity>> downloadDict() {
+    public Observable<CollectResponse<LoginInfoData>> downloadDict() {
         return apiService.downloadDict();
     }
 

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

@@ -26,6 +26,7 @@ public class DaoMaster extends AbstractDaoMaster {
         BreedingRecordEntityDao.createTable(db, ifNotExists);
         CattleResumeEntityDao.createTable(db, ifNotExists);
         DictEntityDao.createTable(db, ifNotExists);
+        FrozenSemenEntityDao.createTable(db, ifNotExists);
         GenTableDao.createTable(db, ifNotExists);
         GenTableColumnDao.createTable(db, ifNotExists);
         ImmuneBatchDetailEntityDao.createTable(db, ifNotExists);
@@ -43,6 +44,7 @@ public class DaoMaster extends AbstractDaoMaster {
         BreedingRecordEntityDao.dropTable(db, ifExists);
         CattleResumeEntityDao.dropTable(db, ifExists);
         DictEntityDao.dropTable(db, ifExists);
+        FrozenSemenEntityDao.dropTable(db, ifExists);
         GenTableDao.dropTable(db, ifExists);
         GenTableColumnDao.dropTable(db, ifExists);
         ImmuneBatchDetailEntityDao.dropTable(db, ifExists);
@@ -74,6 +76,7 @@ public class DaoMaster extends AbstractDaoMaster {
         registerDaoClass(BreedingRecordEntityDao.class);
         registerDaoClass(CattleResumeEntityDao.class);
         registerDaoClass(DictEntityDao.class);
+        registerDaoClass(FrozenSemenEntityDao.class);
         registerDaoClass(GenTableDao.class);
         registerDaoClass(GenTableColumnDao.class);
         registerDaoClass(ImmuneBatchDetailEntityDao.class);

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

@@ -13,6 +13,7 @@ import com.phlx.anchorcollect.entity.BreedingRecordDetailEntity;
 import com.phlx.anchorcollect.entity.BreedingRecordEntity;
 import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
+import com.phlx.anchorcollect.entity.FrozenSemenEntity;
 import com.phlx.anchorcollect.entity.GenTable;
 import com.phlx.anchorcollect.entity.GenTableColumn;
 import com.phlx.anchorcollect.entity.ImmuneBatchDetailEntity;
@@ -27,6 +28,7 @@ import com.phlx.anchorcollect.db.gen.BreedingRecordDetailEntityDao;
 import com.phlx.anchorcollect.db.gen.BreedingRecordEntityDao;
 import com.phlx.anchorcollect.db.gen.CattleResumeEntityDao;
 import com.phlx.anchorcollect.db.gen.DictEntityDao;
+import com.phlx.anchorcollect.db.gen.FrozenSemenEntityDao;
 import com.phlx.anchorcollect.db.gen.GenTableDao;
 import com.phlx.anchorcollect.db.gen.GenTableColumnDao;
 import com.phlx.anchorcollect.db.gen.ImmuneBatchDetailEntityDao;
@@ -50,6 +52,7 @@ public class DaoSession extends AbstractDaoSession {
     private final DaoConfig breedingRecordEntityDaoConfig;
     private final DaoConfig cattleResumeEntityDaoConfig;
     private final DaoConfig dictEntityDaoConfig;
+    private final DaoConfig frozenSemenEntityDaoConfig;
     private final DaoConfig genTableDaoConfig;
     private final DaoConfig genTableColumnDaoConfig;
     private final DaoConfig immuneBatchDetailEntityDaoConfig;
@@ -64,6 +67,7 @@ public class DaoSession extends AbstractDaoSession {
     private final BreedingRecordEntityDao breedingRecordEntityDao;
     private final CattleResumeEntityDao cattleResumeEntityDao;
     private final DictEntityDao dictEntityDao;
+    private final FrozenSemenEntityDao frozenSemenEntityDao;
     private final GenTableDao genTableDao;
     private final GenTableColumnDao genTableColumnDao;
     private final ImmuneBatchDetailEntityDao immuneBatchDetailEntityDao;
@@ -92,6 +96,9 @@ public class DaoSession extends AbstractDaoSession {
         dictEntityDaoConfig = daoConfigMap.get(DictEntityDao.class).clone();
         dictEntityDaoConfig.initIdentityScope(type);
 
+        frozenSemenEntityDaoConfig = daoConfigMap.get(FrozenSemenEntityDao.class).clone();
+        frozenSemenEntityDaoConfig.initIdentityScope(type);
+
         genTableDaoConfig = daoConfigMap.get(GenTableDao.class).clone();
         genTableDaoConfig.initIdentityScope(type);
 
@@ -121,6 +128,7 @@ public class DaoSession extends AbstractDaoSession {
         breedingRecordEntityDao = new BreedingRecordEntityDao(breedingRecordEntityDaoConfig, this);
         cattleResumeEntityDao = new CattleResumeEntityDao(cattleResumeEntityDaoConfig, this);
         dictEntityDao = new DictEntityDao(dictEntityDaoConfig, this);
+        frozenSemenEntityDao = new FrozenSemenEntityDao(frozenSemenEntityDaoConfig, this);
         genTableDao = new GenTableDao(genTableDaoConfig, this);
         genTableColumnDao = new GenTableColumnDao(genTableColumnDaoConfig, this);
         immuneBatchDetailEntityDao = new ImmuneBatchDetailEntityDao(immuneBatchDetailEntityDaoConfig, this);
@@ -135,6 +143,7 @@ public class DaoSession extends AbstractDaoSession {
         registerDao(BreedingRecordEntity.class, breedingRecordEntityDao);
         registerDao(CattleResumeEntity.class, cattleResumeEntityDao);
         registerDao(DictEntity.class, dictEntityDao);
+        registerDao(FrozenSemenEntity.class, frozenSemenEntityDao);
         registerDao(GenTable.class, genTableDao);
         registerDao(GenTableColumn.class, genTableColumnDao);
         registerDao(ImmuneBatchDetailEntity.class, immuneBatchDetailEntityDao);
@@ -151,6 +160,7 @@ public class DaoSession extends AbstractDaoSession {
         breedingRecordEntityDaoConfig.clearIdentityScope();
         cattleResumeEntityDaoConfig.clearIdentityScope();
         dictEntityDaoConfig.clearIdentityScope();
+        frozenSemenEntityDaoConfig.clearIdentityScope();
         genTableDaoConfig.clearIdentityScope();
         genTableColumnDaoConfig.clearIdentityScope();
         immuneBatchDetailEntityDaoConfig.clearIdentityScope();
@@ -181,6 +191,10 @@ public class DaoSession extends AbstractDaoSession {
         return dictEntityDao;
     }
 
+    public FrozenSemenEntityDao getFrozenSemenEntityDao() {
+        return frozenSemenEntityDao;
+    }
+
     public GenTableDao getGenTableDao() {
         return genTableDao;
     }

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

@@ -65,6 +65,43 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
     /** 母登记号 */
     private String motherReg;
     
+    /** 祖父号 */
+    private String ffNum;
+
+    /** 祖母号 */
+    private String fmNum;
+
+    /** 外祖父号 */
+    private String mfNum;
+
+    /** 外祖母号 */
+    private String mmNum;
+
+    /** 曾祖父 */
+    private String fffNum;
+
+    /** 曾祖母 */
+    private String ffmNum;
+
+    /** 曾外祖父 */
+    private String fmfNum;
+
+    /** 曾外祖母 */
+    private String fmmNum;
+
+
+    /** 外曾祖父 */
+    private String mffNum;
+
+    /** 外曾祖母 */
+    private String mfmNum;
+
+    /** 外曾外祖父 */
+    private String mmfNum;
+
+    /** 外曾外祖母 */
+    private String mmmNum;
+
     /** 离乳重 */
     private Double fromMilkHeavy;
 
@@ -155,6 +192,18 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
         grade = in.readString();
         fatherReg = in.readString();
         motherReg = in.readString();
+        ffNum = in.readString();
+        fmNum = in.readString();
+        mfNum = in.readString();
+        mmNum = in.readString();
+        fffNum = in.readString();
+        ffmNum = in.readString();
+        fmfNum = in.readString();
+        fmmNum = in.readString();
+        mffNum = in.readString();
+        mfmNum = in.readString();
+        mmfNum = in.readString();
+        mmmNum = in.readString();
         if (in.readByte() == 0) {
             fromMilkHeavy = null;
         } else {
@@ -197,11 +246,13 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
         remark = in.readString();
     }
 
-    @Generated(hash = 1557063295)
+    @Generated(hash = 952388002)
     public CattleResumeEntity(Long unid, String registrationNo, String individualNo, String circleNo,
             String raiseType, String raiseVarieties, String birthdate, Double birthHeavy, String sex,
             String birthDifficulty, String isTwins, String childTime, String grade, String fatherReg,
-            String motherReg, Double fromMilkHeavy, String health, String junHeavy, String decAppScore,
+            String motherReg, String ffNum, String fmNum, String mfNum, String mmNum, String fffNum,
+            String ffmNum, String fmfNum, String fmmNum, String mffNum, String mfmNum, String mmfNum,
+            String mmmNum, Double fromMilkHeavy, String health, String junHeavy, String decAppScore,
             String photo, String photoPath, String status, Long isOut, Integer age, String colour,
             String inputTime, Long deptId, Long deptName, String uploadStatus, String uploadTime,
             String createBy, String createTime, String updateBy, String updateTime, String remark) {
@@ -220,6 +271,18 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
         this.grade = grade;
         this.fatherReg = fatherReg;
         this.motherReg = motherReg;
+        this.ffNum = ffNum;
+        this.fmNum = fmNum;
+        this.mfNum = mfNum;
+        this.mmNum = mmNum;
+        this.fffNum = fffNum;
+        this.ffmNum = ffmNum;
+        this.fmfNum = fmfNum;
+        this.fmmNum = fmmNum;
+        this.mffNum = mffNum;
+        this.mfmNum = mfmNum;
+        this.mmfNum = mmfNum;
+        this.mmmNum = mmmNum;
         this.fromMilkHeavy = fromMilkHeavy;
         this.health = health;
         this.junHeavy = junHeavy;
@@ -269,6 +332,18 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
         dest.writeString(grade);
         dest.writeString(fatherReg);
         dest.writeString(motherReg);
+        dest.writeString(ffNum);
+        dest.writeString(fmNum);
+        dest.writeString(mfNum);
+        dest.writeString(mmNum);
+        dest.writeString(fffNum);
+        dest.writeString(ffmNum);
+        dest.writeString(fmfNum);
+        dest.writeString(fmmNum);
+        dest.writeString(mffNum);
+        dest.writeString(mfmNum);
+        dest.writeString(mmfNum);
+        dest.writeString(mmmNum);
         if (fromMilkHeavy == null) {
             dest.writeByte((byte) 0);
         } else {
@@ -453,6 +528,102 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
         this.motherReg = motherReg;
     }
 
+    public String getFfNum() {
+        return ffNum;
+    }
+
+    public void setFfNum(String ffNum) {
+        this.ffNum = ffNum;
+    }
+
+    public String getFmNum() {
+        return fmNum;
+    }
+
+    public void setFmNum(String fmNum) {
+        this.fmNum = fmNum;
+    }
+
+    public String getMfNum() {
+        return mfNum;
+    }
+
+    public void setMfNum(String mfNum) {
+        this.mfNum = mfNum;
+    }
+
+    public String getMmNum() {
+        return mmNum;
+    }
+
+    public void setMmNum(String mmNum) {
+        this.mmNum = mmNum;
+    }
+
+    public String getFffNum() {
+        return fffNum;
+    }
+
+    public void setFffNum(String fffNum) {
+        this.fffNum = fffNum;
+    }
+
+    public String getFfmNum() {
+        return ffmNum;
+    }
+
+    public void setFfmNum(String ffmNum) {
+        this.ffmNum = ffmNum;
+    }
+
+    public String getFmfNum() {
+        return fmfNum;
+    }
+
+    public void setFmfNum(String fmfNum) {
+        this.fmfNum = fmfNum;
+    }
+
+    public String getFmmNum() {
+        return fmmNum;
+    }
+
+    public void setFmmNum(String fmmNum) {
+        this.fmmNum = fmmNum;
+    }
+
+    public String getMffNum() {
+        return mffNum;
+    }
+
+    public void setMffNum(String mffNum) {
+        this.mffNum = mffNum;
+    }
+
+    public String getMfmNum() {
+        return mfmNum;
+    }
+
+    public void setMfmNum(String mfmNum) {
+        this.mfmNum = mfmNum;
+    }
+
+    public String getMmfNum() {
+        return mmfNum;
+    }
+
+    public void setMmfNum(String mmfNum) {
+        this.mmfNum = mmfNum;
+    }
+
+    public String getMmmNum() {
+        return mmmNum;
+    }
+
+    public void setMmmNum(String mmmNum) {
+        this.mmmNum = mmmNum;
+    }
+
     public Double getFromMilkHeavy() {
         return fromMilkHeavy;
     }
@@ -613,47 +784,6 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
         this.remark = remark;
     }
 
-    @Override
-    public String toString() {
-        return "CattleResumeEntity{" +
-                "unid=" + unid +
-                ", registrationNo='" + registrationNo + '\'' +
-                ", individualNo='" + individualNo + '\'' +
-                ", circleNo='" + circleNo + '\'' +
-                ", raiseType='" + raiseType + '\'' +
-                ", raiseVarieties='" + raiseVarieties + '\'' +
-                ", birthdate='" + birthdate + '\'' +
-                ", birthHeavy=" + birthHeavy +
-                ", sex='" + sex + '\'' +
-                ", birthDifficulty='" + birthDifficulty + '\'' +
-                ", isTwins='" + isTwins + '\'' +
-                ", childTime='" + childTime + '\'' +
-                ", grade='" + grade + '\'' +
-                ", fatherReg='" + fatherReg + '\'' +
-                ", motherReg='" + motherReg + '\'' +
-                ", fromMilkHeavy=" + fromMilkHeavy +
-                ", health='" + health + '\'' +
-                ", junHeavy='" + junHeavy + '\'' +
-                ", decAppScore='" + decAppScore + '\'' +
-                ", photo='" + photo + '\'' +
-                ", photoPath='" + photoPath + '\'' +
-                ", status='" + status + '\'' +
-                ", isOut=" + isOut +
-                ", age=" + age +
-                ", colour='" + colour + '\'' +
-                ", inputTime='" + inputTime + '\'' +
-                ", deptId=" + deptId +
-                ", deptName=" + deptName +
-                ", uploadStatus='" + uploadStatus + '\'' +
-                ", uploadTime='" + uploadTime + '\'' +
-                ", createBy='" + createBy + '\'' +
-                ", createTime='" + createTime + '\'' +
-                ", updateBy='" + updateBy + '\'' +
-                ", updateTime='" + updateTime + '\'' +
-                ", remark='" + remark + '\'' +
-                '}';
-    }
-
     public void copyEntity(CattleResumeEntity cre) {
 
         this.unid= cre.getUnid();
@@ -671,6 +801,18 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
         this.grade= cre.getGrade();
         this.fatherReg= cre.getFatherReg();
         this.motherReg= cre.getMotherReg();
+        this.ffNum= cre.getFfNum();
+        this.fmNum= cre.getFmNum();
+        this.mfNum= cre.getMfNum();
+        this.mmNum= cre.getMmNum();
+        this.fffNum= cre.getFffNum();
+        this.ffmNum= cre.getFfmNum();
+        this.fmfNum= cre.getFmfNum();
+        this.fmmNum= cre.getFmmNum();
+        this.mffNum= cre.getMffNum();
+        this.mfmNum= cre.getMfmNum();
+        this.mmfNum= cre.getMmfNum();
+        this.mmmNum= cre.getMmmNum();
         this.fromMilkHeavy= cre.getFromMilkHeavy();
         this.health= cre.getHealth();
         this.junHeavy= cre.getJunHeavy();

app/src/main/java/com/phlx/anchorcollect/entity/FrozenSemenEntity.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;
+
+/**
+ * 冻精bean
+ */
+@Entity
+public class FrozenSemenEntity extends BaseObservable implements Parcelable {
+    
+    /** 主键 */
+    @Id(autoincrement = false)
+    private Long id;
+
+    /** 注册号 */
+    private String code;
+
+    /** 父本 */
+    private String fuCode;
+
+    /** 母本 */
+    private String muCode;
+
+    /** 祖父 */
+    private String zfCode;
+
+    /** 祖母 */
+    private String zmCode;
+
+    /** 外祖父 */
+    private String wzfCode;
+
+    /** 外祖母 */
+    private String wzmCode;
+
+    /** 照片 */
+    private String img;
+
+    /** 冻精信息 */
+    private String info;
+
+    /** 部门id */
+    private Long deptId;
+
+    public FrozenSemenEntity() {
+    }
+
+    protected FrozenSemenEntity(Parcel in) {
+        if (in.readByte() == 0) {
+            id = null;
+        } else {
+            id = in.readLong();
+        }
+        code = in.readString();
+        fuCode = in.readString();
+        muCode = in.readString();
+        zfCode = in.readString();
+        zmCode = in.readString();
+        wzfCode = in.readString();
+        wzmCode = in.readString();
+        img = in.readString();
+        info = in.readString();
+        if (in.readByte() == 0) {
+            deptId = null;
+        } else {
+            deptId = in.readLong();
+        }
+    }
+
+    @Generated(hash = 1187217824)
+    public FrozenSemenEntity(Long id, String code, String fuCode, String muCode, String zfCode,
+            String zmCode, String wzfCode, String wzmCode, String img, String info, Long deptId) {
+        this.id = id;
+        this.code = code;
+        this.fuCode = fuCode;
+        this.muCode = muCode;
+        this.zfCode = zfCode;
+        this.zmCode = zmCode;
+        this.wzfCode = wzfCode;
+        this.wzmCode = wzmCode;
+        this.img = img;
+        this.info = info;
+        this.deptId = deptId;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        if (id == null) {
+            dest.writeByte((byte) 0);
+        } else {
+            dest.writeByte((byte) 1);
+            dest.writeLong(id);
+        }
+        dest.writeString(code);
+        dest.writeString(fuCode);
+        dest.writeString(muCode);
+        dest.writeString(zfCode);
+        dest.writeString(zmCode);
+        dest.writeString(wzfCode);
+        dest.writeString(wzmCode);
+        dest.writeString(img);
+        dest.writeString(info);
+        if (deptId == null) {
+            dest.writeByte((byte) 0);
+        } else {
+            dest.writeByte((byte) 1);
+            dest.writeLong(deptId);
+        }
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<FrozenSemenEntity> CREATOR = new Creator<FrozenSemenEntity>() {
+        @Override
+        public FrozenSemenEntity createFromParcel(Parcel in) {
+            return new FrozenSemenEntity(in);
+        }
+
+        @Override
+        public FrozenSemenEntity[] newArray(int size) {
+            return new FrozenSemenEntity[size];
+        }
+    };
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getFuCode() {
+        return fuCode;
+    }
+
+    public void setFuCode(String fuCode) {
+        this.fuCode = fuCode;
+    }
+
+    public String getMuCode() {
+        return muCode;
+    }
+
+    public void setMuCode(String muCode) {
+        this.muCode = muCode;
+    }
+
+    public String getZfCode() {
+        return zfCode;
+    }
+
+    public void setZfCode(String zfCode) {
+        this.zfCode = zfCode;
+    }
+
+    public String getZmCode() {
+        return zmCode;
+    }
+
+    public void setZmCode(String zmCode) {
+        this.zmCode = zmCode;
+    }
+
+    public String getWzfCode() {
+        return wzfCode;
+    }
+
+    public void setWzfCode(String wzfCode) {
+        this.wzfCode = wzfCode;
+    }
+
+    public String getWzmCode() {
+        return wzmCode;
+    }
+
+    public void setWzmCode(String wzmCode) {
+        this.wzmCode = wzmCode;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    @Override
+    public String toString() {
+        return "FrozenSemenEntity{" +
+                "id=" + id +
+                ", code='" + code + '\'' +
+                ", fuCode='" + fuCode + '\'' +
+                ", muCode='" + muCode + '\'' +
+                ", zfCode='" + zfCode + '\'' +
+                ", zmCode='" + zmCode + '\'' +
+                ", wzfCode='" + wzfCode + '\'' +
+                ", wzmCode='" + wzmCode + '\'' +
+                ", img='" + img + '\'' +
+                ", info='" + info + '\'' +
+                ", deptId=" + deptId +
+                '}';
+    }
+}

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

+package com.phlx.anchorcollect.entity;
+
+import java.util.List;
+
+public class LoginInfoData {
+
+    private List<DictEntity> dictList;
+
+    private List<FrozenSemenEntity> frozenSemenList;
+
+    public LoginInfoData() {
+    }
+
+    public List<DictEntity> getDictList() {
+        return dictList;
+    }
+
+    public void setDictList(List<DictEntity> dictList) {
+        this.dictList = dictList;
+    }
+
+    public List<FrozenSemenEntity> getFrozenSemenList() {
+        return frozenSemenList;
+    }
+
+    public void setFrozenSemenList(List<FrozenSemenEntity> frozenSemenList) {
+        this.frozenSemenList = frozenSemenList;
+    }
+
+    @Override
+    public String toString() {
+        return "LoginInfoData{" +
+                "dictList=" + dictList +
+                ", frozenSemenList=" + frozenSemenList +
+                '}';
+    }
+}

app/src/main/java/com/phlx/anchorcollect/ui/bind/BindVM.java

@@ -102,7 +102,7 @@ public class BindVM extends BackBarVM<Repository> implements OnInventoryListener
         QueryBuilder<CattleResumeEntity> builder0 =
                 DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
                         .where(CattleResumeEntityDao.Properties.RegistrationNo.eq(""));
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
+        DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder0, new DbQueryCallBack<CattleResumeEntity>() {
             @Override
             public void onSuccess(List<CattleResumeEntity> result) {
 
@@ -119,7 +119,7 @@ public class BindVM extends BackBarVM<Repository> implements OnInventoryListener
                 ToastUtils.showShort("查询基础数据数量失败！");
                 dismissDialog();
             }
-        }).queryAsyncAll(CattleResumeEntity.class, builder0);
+        });
 
 
     }
@@ -147,11 +147,11 @@ public class BindVM extends BackBarVM<Repository> implements OnInventoryListener
             return;
         }
 
-        //判断是否已经绑定过高频耳标
+        //判断是否已经绑定过电子耳标
         QueryBuilder<CattleResumeEntity> builder0 =
                 DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
                         .where(CattleResumeEntityDao.Properties.RegistrationNo.eq(registrationNo.get()));
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
+        DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder0, new DbQueryCallBack<CattleResumeEntity>() {
             @Override
             public void onSuccess(List<CattleResumeEntity> result) {
 
@@ -168,7 +168,7 @@ public class BindVM extends BackBarVM<Repository> implements OnInventoryListener
                 ToastUtils.showShort("查询基础数据数量失败！");
                 dismissDialog();
             }
-        }).queryAsyncAll(CattleResumeEntity.class, builder0);
+        });
     }
 
     private void bindRfid() {

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

@@ -30,7 +30,6 @@ import com.kongzue.dialogx.util.InputInfo;
 import com.kongzue.dialogx.util.TextInfo;
 import com.lingber.mycontrol.datagridview.DataGridView;
 import com.lingber.mycontrol.datagridview.RecyclerviewAdapter;
-import com.phlx.anchorcollect.App;
 import com.phlx.anchorcollect.BR;
 import com.phlx.anchorcollect.Configs;
 import com.phlx.anchorcollect.R;
@@ -40,7 +39,7 @@ import com.phlx.anchorcollect.entity.BreedingRecordDetailEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenTableColumn;
 import com.phlx.anchorcollect.ui.fragment.vm.BreedingRecordVM;
-import com.phlx.anchorcollect.util.DictUtils;
+import com.phlx.anchorcollect.util.LoginInfoUtils;
 import com.phlx.anchorcollect.util.ImagePicker;
 import com.phlx.anchorcollect.util.StringUtil;
 import com.phlx.anchorcollect.widget.SpaceItemDecoration;
@@ -191,13 +190,13 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
                 .title(uiParamEntity.getColumnComment())
 //                .positiveText("确认")
 //                .negativeText("取消")
-                .items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
+                .items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
                 .itemsCallback(new MaterialDialog.ListCallback() {
                     @Override
                     public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
                         Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
                         viewModel.currentParamEntity.setShowName(text.toString());
-                        List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
+                        List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
                         viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
                         viewModel.currentParamEntity.notifyChange();
                     }
@@ -211,14 +210,14 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
         new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
 //                .cancelable(false).canceledOnTouchOutside(false)
                 .positiveText("确定")
-                .items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
+                .items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
                 .itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
                     @Override
                     public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
 
                         String showName = "";
                         String content = "";
-                        List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
+                        List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
                         if (which != null && which.length > 0) {
                             for (Integer i : which) {
                                 showName += distTypeList.get(i).getDictLabel();
@@ -309,6 +308,11 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
                                 ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize - finalColumnPointSize - 1) + "位，小数最大" + finalColumnPointSize + "位");
                                 return true;
                             }
+                        } else if (uiParamEntity.getJavaType().equals("Integer")) {
+                            if (!inputStr.matches("^[1-9][0-9]{0," + (finalColumnSize) + "}$")) {
+                                ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize) + "位");
+                                return true;
+                            }
                         }
                         viewModel.currentParamEntity.setShowName(inputStr);
                         viewModel.currentParamEntity.setContent(inputStr);

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

@@ -36,8 +36,7 @@ import com.phlx.anchorcollect.databinding.FragmentImmunRecordBinding;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenTableColumn;
 import com.phlx.anchorcollect.ui.fragment.vm.ImmunRecordVM;
-import com.phlx.anchorcollect.ui.fragment.vm.PerformanceVM;
-import com.phlx.anchorcollect.util.DictUtils;
+import com.phlx.anchorcollect.util.LoginInfoUtils;
 import com.phlx.anchorcollect.util.ImagePicker;
 import com.phlx.anchorcollect.widget.SpaceItemDecoration;
 import com.tbruyelle.rxpermissions2.RxPermissions;
@@ -48,8 +47,6 @@ import java.util.List;
 
 import io.reactivex.functions.Consumer;
 import me.goldze.mvvmhabit.base.BaseFragment;
-import me.goldze.mvvmhabit.base.BaseViewModel;
-import me.goldze.mvvmhabit.utils.StringUtils;
 import me.goldze.mvvmhabit.utils.ToastUtils;
 
 public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding, ImmunRecordVM> {
@@ -176,13 +173,13 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
                 .title(uiParamEntity.getColumnComment())
 //                .positiveText("确认")
 //                .negativeText("取消")
-                .items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
+                .items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
                 .itemsCallback(new MaterialDialog.ListCallback() {
                     @Override
                     public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
                         Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
                         viewModel.currentParamEntity.setShowName(text.toString());
-                        List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
+                        List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
                         viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
                         viewModel.currentParamEntity.notifyChange();
                     }
@@ -196,14 +193,14 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
         new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
                 .cancelable(false).canceledOnTouchOutside(false)
                 .positiveText("确定")
-                .items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
+                .items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
                 .itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
                     @Override
                     public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
 
                         String showName = "";
                         String content = "";
-                        List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
+                        List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
                         if (which != null && which.length > 0) {
                             for (Integer i : which) {
                                 showName += distTypeList.get(i).getDictLabel();
@@ -294,6 +291,11 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
                                 ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize - finalColumnPointSize - 1) + "位，小数最大" + finalColumnPointSize + "位");
                                 return true;
                             }
+                        } else if (uiParamEntity.getJavaType().equals("Integer")) {
+                            if (!inputStr.matches("^[1-9][0-9]{0," + (finalColumnSize) + "}$")) {
+                                ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize) + "位");
+                                return true;
+                            }
                         }
                         viewModel.currentParamEntity.setShowName(inputStr);
                         viewModel.currentParamEntity.setContent(inputStr);
@@ -405,7 +407,7 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
 
             Window dialogWindow = mDialog.getWindow();
             if (dialogWindow != null) {
-                dialogWindow.setWindowAnimations(com.bigkoo.pickerview.R.style.picker_view_slide_anim);//修改动画样式
+                dialogWindow.setWindowAnimations(R.style.picker_view_slide_anim);//修改动画样式
                 dialogWindow.setGravity(Gravity.CENTER);//改成Bottom,底部显示
                 dialogWindow.setDimAmount(0.3f);
             }

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

@@ -35,8 +35,7 @@ import com.phlx.anchorcollect.databinding.FragmentMedicalRecordBinding;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenTableColumn;
 import com.phlx.anchorcollect.ui.fragment.vm.MedicalRecordVM;
-import com.phlx.anchorcollect.ui.fragment.vm.PerformanceVM;
-import com.phlx.anchorcollect.util.DictUtils;
+import com.phlx.anchorcollect.util.LoginInfoUtils;
 import com.phlx.anchorcollect.util.ImagePicker;
 import com.phlx.anchorcollect.widget.SpaceItemDecoration;
 import com.tbruyelle.rxpermissions2.RxPermissions;
@@ -47,7 +46,6 @@ 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;
 
@@ -174,13 +172,13 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
                 .title(uiParamEntity.getColumnComment())
 //                .positiveText("确认")
 //                .negativeText("取消")
-                .items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
+                .items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
                 .itemsCallback(new MaterialDialog.ListCallback() {
                     @Override
                     public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
                         Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
                         viewModel.currentParamEntity.setShowName(text.toString());
-                        List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
+                        List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
                         viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
                         viewModel.currentParamEntity.notifyChange();
                     }
@@ -194,14 +192,14 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
         new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
                 .cancelable(false).canceledOnTouchOutside(false)
                 .positiveText("确定")
-                .items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
+                .items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
                 .itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
                     @Override
                     public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
 
                         String showName = "";
                         String content = "";
-                        List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
+                        List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
                         if (which != null && which.length > 0) {
                             for (Integer i : which) {
                                 showName += distTypeList.get(i).getDictLabel();
@@ -292,6 +290,11 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
                                 ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize - finalColumnPointSize - 1) + "位，小数最大" + finalColumnPointSize + "位");
                                 return true;
                             }
+                        } else if (uiParamEntity.getJavaType().equals("Integer")) {
+                            if (!inputStr.matches("^[1-9][0-9]{0," + (finalColumnSize) + "}$")) {
+                                ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize) + "位");
+                                return true;
+                            }
                         }
                         viewModel.currentParamEntity.setShowName(inputStr);
                         viewModel.currentParamEntity.setContent(inputStr);
@@ -403,7 +406,7 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
 
             Window dialogWindow = mDialog.getWindow();
             if (dialogWindow != null) {
-                dialogWindow.setWindowAnimations(com.bigkoo.pickerview.R.style.picker_view_slide_anim);//修改动画样式
+                dialogWindow.setWindowAnimations(R.style.picker_view_slide_anim);//修改动画样式
                 dialogWindow.setGravity(Gravity.CENTER);//改成Bottom,底部显示
                 dialogWindow.setDimAmount(0.3f);
             }

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

@@ -2,7 +2,6 @@ package com.phlx.anchorcollect.ui.fragment;
 
 import android.Manifest;
 import android.app.Dialog;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.text.InputType;
 import android.util.Log;
@@ -35,10 +34,8 @@ import com.phlx.anchorcollect.data.VMFactory;
 import com.phlx.anchorcollect.databinding.FragmentPerformanceBinding;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.entity.GenTableColumn;
-import com.phlx.anchorcollect.rfid.ModuleManager;
-import com.phlx.anchorcollect.ui.fragment.vm.BasicsCollectVM;
 import com.phlx.anchorcollect.ui.fragment.vm.PerformanceVM;
-import com.phlx.anchorcollect.util.DictUtils;
+import com.phlx.anchorcollect.util.LoginInfoUtils;
 import com.phlx.anchorcollect.util.ImagePicker;
 import com.phlx.anchorcollect.widget.SpaceItemDecoration;
 import com.tbruyelle.rxpermissions2.RxPermissions;
@@ -49,7 +46,6 @@ 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;
 
@@ -177,13 +173,13 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
                 .title(uiParamEntity.getColumnComment())
 //                .positiveText("确认")
 //                .negativeText("取消")
-                .items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
+                .items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
                 .itemsCallback(new MaterialDialog.ListCallback() {
                     @Override
                     public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
                         Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
                         viewModel.currentParamEntity.setShowName(text.toString());
-                        List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
+                        List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
                         viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
                         viewModel.currentParamEntity.notifyChange();
                     }
@@ -197,14 +193,14 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
         new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
                 .cancelable(false).canceledOnTouchOutside(false)
                 .positiveText("确定")
-                .items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
+                .items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
                 .itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
                     @Override
                     public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
 
                         String showName = "";
                         String content = "";
-                        List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
+                        List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
                         if (which != null && which.length > 0) {
                             for (Integer i : which) {
                                 showName += distTypeList.get(i).getDictLabel();
@@ -295,6 +291,11 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
                                 ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize - finalColumnPointSize - 1) + "位，小数最大" + finalColumnPointSize + "位");
                                 return true;
                             }
+                        } else if (uiParamEntity.getJavaType().equals("Integer")) {
+                            if (!inputStr.matches("^[1-9][0-9]{0," + (finalColumnSize) + "}$")) {
+                                ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize) + "位");
+                                return true;
+                            }
                         }
                         viewModel.currentParamEntity.setShowName(inputStr);
                         viewModel.currentParamEntity.setContent(inputStr);
@@ -406,7 +407,7 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
 
             Window dialogWindow = mDialog.getWindow();
             if (dialogWindow != null) {
-                dialogWindow.setWindowAnimations(com.bigkoo.pickerview.R.style.picker_view_slide_anim);//修改动画样式
+                dialogWindow.setWindowAnimations(R.style.picker_view_slide_anim);//修改动画样式
                 dialogWindow.setGravity(Gravity.CENTER);//改成Bottom,底部显示
                 dialogWindow.setDimAmount(0.3f);
             }

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

@@ -44,7 +44,7 @@ import com.phlx.anchorcollect.entity.WeightManEntity;
 import com.phlx.anchorcollect.event.EventTag;
 import com.phlx.anchorcollect.ui.fragment.vm.WeightManVM;
 import com.phlx.anchorcollect.ui.info.CattleActivity;
-import com.phlx.anchorcollect.util.DictUtils;
+import com.phlx.anchorcollect.util.LoginInfoUtils;
 import com.phlx.anchorcollect.util.ImagePicker;
 import com.phlx.anchorcollect.util.TextUtil;
 import com.phlx.anchorcollect.widget.SpaceItemDecoration;
@@ -309,13 +309,13 @@ public class WeightManFragment extends BaseFragment<FragmentWeightmanBinding, We
                 .title(uiParamEntity.getColumnComment())
 //                .positiveText("确认")
 //                .negativeText("取消")
-                .items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
+                .items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
                 .itemsCallback(new MaterialDialog.ListCallback() {
                     @Override
                     public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
                         Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
                         viewModel.currentParamEntity.setShowName(text.toString());
-                        List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
+                        List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
                         viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
                         viewModel.currentParamEntity.notifyChange();
                     }
@@ -329,14 +329,14 @@ public class WeightManFragment extends BaseFragment<FragmentWeightmanBinding, We
         new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
                 .cancelable(false).canceledOnTouchOutside(false)
                 .positiveText("确定")
-                .items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
+                .items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
                 .itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
                     @Override
                     public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
 
                         String showName = "";
                         String content = "";
-                        List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
+                        List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
                         if (which != null && which.length > 0) {
                             for (Integer i : which) {
                                 showName += distTypeList.get(i).getDictLabel();
@@ -427,6 +427,11 @@ public class WeightManFragment extends BaseFragment<FragmentWeightmanBinding, We
                                 ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize - finalColumnPointSize - 1) + "位，小数最大" + finalColumnPointSize + "位");
                                 return true;
                             }
+                        } else if (uiParamEntity.getJavaType().equals("Integer")) {
+                            if (!inputStr.matches("^[1-9][0-9]{0," + (finalColumnSize) + "}$")) {
+                                ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize) + "位");
+                                return true;
+                            }
                         }
                         viewModel.currentParamEntity.setShowName(inputStr);
                         viewModel.currentParamEntity.setContent(inputStr);

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

@@ -32,6 +32,7 @@ import com.phlx.anchorcollect.db.interf.DbIDUCallBack;
 import com.phlx.anchorcollect.db.interf.DbQueryCallBack;
 import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
+import com.phlx.anchorcollect.entity.FrozenSemenEntity;
 import com.phlx.anchorcollect.entity.GenTableColumn;
 import com.phlx.anchorcollect.entity.WeightManEntity;
 import com.phlx.anchorcollect.event.EventMsg;
@@ -41,11 +42,11 @@ import com.phlx.anchorcollect.ui.labelchange.LabelChangeActivity;
 import com.phlx.anchorcollect.ui.fragment.list.CollectGridItem;
 import com.phlx.anchorcollect.ui.setting.SettingActivity;
 import com.phlx.anchorcollect.ui.setting.SyncActivity;
+import com.phlx.anchorcollect.util.LoginInfoUtils;
 import com.phlx.anchorcollect.util.EntityUtils;
 import com.phlx.anchorcollect.util.TextUtil;
 import com.uhf.structures.InventoryData;
 import com.uhf.structures.OnInventoryListener;
-import com.uhf.structures.Rfid_Value;
 
 import org.greenrobot.greendao.query.QueryBuilder;
 
@@ -326,7 +327,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
                 DbUtil.getInstance().getQueryBuilder(WeightManEntity.class)
                         .where(WeightManEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid))
                         .orderDesc(WeightManEntityDao.Properties.WTime);
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<WeightManEntity>() {
+        DbUtil.getInstance().queryAsyncAll(WeightManEntity.class, builder3, new DbQueryCallBack<WeightManEntity>() {
             @Override
             public void onSuccess(List<WeightManEntity> result) {
 
@@ -379,7 +380,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
                 cn.wandersnail.commons.util.ToastUtils.showShort("查询称重记录失败！");
                 dismissDialog();
             }
-        }).queryAsyncAll(WeightManEntity.class, builder3);
+        });
     }
 
     public void onItemClick(GenTableColumn entity) {
@@ -518,7 +519,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
 
     private void queryCattleResume(QueryBuilder<CattleResumeEntity> builder) {
 
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
+        DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
             @Override
             public void onSuccess(List<CattleResumeEntity> result) {
 
@@ -604,7 +605,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
                 onNotifyAllEvent.setValue(true);
                 ToastUtils.showShort("基础档案数据库查询失败");
             }
-        }).queryAsyncAll(CattleResumeEntity.class, builder);
+        });
     }
 
     private void saveCattleresume() {
@@ -655,11 +656,23 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
         cattleResumeEntity.setRemark(remarkParamEntity.getContent());
         cattleResumeEntity.setUploadStatus("0");
 
+        //添加冻精系谱到牛只系谱
+        if(!StringUtils.isEmpty(cattleResumeEntity.getFatherReg())){
+            FrozenSemenEntity frozenSemenEntity =  LoginInfoUtils.getFrozenSemenForName(cattleResumeEntity.getFatherReg());
+            if(frozenSemenEntity!=null){
+                cattleResumeEntity.setFfNum(frozenSemenEntity.getFuCode());
+                cattleResumeEntity.setFmNum(frozenSemenEntity.getMuCode());
+                cattleResumeEntity.setFffNum(frozenSemenEntity.getZfCode());
+                cattleResumeEntity.setFfmNum(frozenSemenEntity.getZmCode());
+                cattleResumeEntity.setFmfNum(frozenSemenEntity.getWzfCode());
+                cattleResumeEntity.setFmmNum(frozenSemenEntity.getWzmCode());
+            }
+        }
 
         uploadData = new ArrayList<>();
         uploadData.add(cattleResumeEntity);
 
-        DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+        DbUtil.getInstance().insertAsyncBatch(CattleResumeEntity.class, uploadData, new DbIDUCallBack() {
             @Override
             public void onNotification(boolean result) {
                 dismissDialog();
@@ -672,7 +685,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
                     ToastUtils.showShort("保存基础信息失败");
                 }
             }
-        }).insertAsyncBatch(CattleResumeEntity.class, uploadData);
+        });
     }
 
 

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

@@ -148,7 +148,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
 //                                , BreedingRecordEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
                         )
                         .orderDesc(BreedingRecordEntityDao.Properties.CreateTime);
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordEntity>() {
+        DbUtil.getInstance().queryAsyncAll(BreedingRecordEntity.class, builder, new DbQueryCallBack<BreedingRecordEntity>() {
             @Override
             public void onSuccess(List<BreedingRecordEntity> result) {
 
@@ -168,7 +168,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
                 onNotifyAllEvent.setValue(false);
                 ToastUtils.showShort("配种记录主表-数据库查询失败");
             }
-        }).queryAsyncAll(BreedingRecordEntity.class, builder);
+        });
     }
 
 
@@ -231,7 +231,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
         QueryBuilder<BreedingRecordDetailEntity> builder = DbUtil.getInstance().getQueryBuilder(BreedingRecordDetailEntity.class)
                 .where(BreedingRecordDetailEntityDao.Properties.Unid.eq(clikeUnid));
 
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
+        DbUtil.getInstance().queryAsyncAll(BreedingRecordDetailEntity.class, builder, new DbQueryCallBack<BreedingRecordDetailEntity>() {
             @Override
             public void onSuccess(List<BreedingRecordDetailEntity> result) {
                 if (result != null && result.size() > 0)
@@ -244,7 +244,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
                 onNotifyAllEvent.setValue(false);
                 ToastUtils.showShort("配种记录子表-数据库查询失败");
             }
-        }).queryAsyncAll(BreedingRecordDetailEntity.class, builder);
+        });
 
     }
 
@@ -302,7 +302,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
 //                                , BreedingRecordDetailEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
                         )
                         .orderDesc(BreedingRecordDetailEntityDao.Properties.CreateTime);
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
+        DbUtil.getInstance().queryAsyncAll(BreedingRecordDetailEntity.class, builder, new DbQueryCallBack<BreedingRecordDetailEntity>() {
             @Override
             public void onSuccess(List<BreedingRecordDetailEntity> result) {
 
@@ -319,7 +319,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
                 onNotifyAllEvent.setValue(true);
                 ToastUtils.showShort("配种记录子表-数据库查询失败");
             }
-        }).queryAsyncAll(BreedingRecordDetailEntity.class, builder);
+        });
     }
 
     //回显列表的数据
@@ -497,7 +497,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
         uploadData = new ArrayList<>();
         uploadData.add(breedingRecordEntity);
 
-        DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+        DbUtil.getInstance().insertAsyncBatch(BreedingRecordEntity.class, uploadData, new DbIDUCallBack() {
             @Override
             public void onNotification(boolean result) {
                 dismissDialog();
@@ -509,7 +509,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
                     ToastUtils.showShort("保存-配种记录主表-失败");
                 }
             }
-        }).insertAsyncBatch(BreedingRecordEntity.class, uploadData);
+        });
     }
 
     //保存子表
@@ -573,7 +573,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
         detailUploadData = new ArrayList<>();
         detailUploadData.add(breedingRecordDetailEntity);
 
-        DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+        DbUtil.getInstance().insertAsyncBatch(BreedingRecordDetailEntity.class, detailUploadData, new DbIDUCallBack() {
             @Override
             public void onNotification(boolean result) {
                 dismissDialog();
@@ -584,7 +584,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
                     ToastUtils.showShort("保存-配种记录子表-失败");
                 }
             }
-        }).insertAsyncBatch(BreedingRecordDetailEntity.class, detailUploadData);
+        });
     }
 
     //清空数据源

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

@@ -167,7 +167,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
         QueryBuilder<ImmuneBatchEntity> builder =
                 DbUtil.getInstance().getQueryBuilder(ImmuneBatchEntity.class)
                         .where(ImmuneBatchEntityDao.Properties.Unid.eq(Configs.resumeId));
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchEntity>() {
+        DbUtil.getInstance().queryAsyncAll(ImmuneBatchEntity.class, builder, new DbQueryCallBack<ImmuneBatchEntity>() {
             @Override
             public void onSuccess(List<ImmuneBatchEntity> result) {
 
@@ -183,7 +183,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
                 onNotifyAllEvent.setValue(true);
                 ToastUtils.showShort("免疫记录-数据库查询失败");
             }
-        }).queryAsyncAll(ImmuneBatchEntity.class, builder);
+        });
 
     }
 
@@ -291,7 +291,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
                                     , CattleResumeEntityDao.Properties.DeptId.eq(Long.parseLong(SPUtils.getInstance().getString(Configs.SP_DEPT_ID)))
                             );
 
-            DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
+            DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
                 @Override
                 public void onSuccess(List<CattleResumeEntity> result) {
                     //查询圈舍内的牲畜
@@ -310,13 +310,13 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
                     }
 
                     //保存免疫主、子表
-                    DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+                    DbUtil.getInstance().insertAsyncBatch(ImmuneBatchEntity.class, uploadData, new DbIDUCallBack() {
                         @Override
                         public void onNotification(boolean result) {
                             dismissDialog();
                             if (result) {
                                 if (!isModify) {
-                                    DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+                                    DbUtil.getInstance().insertAsyncBatch(ImmuneBatchDetailEntity.class, detailUploadData, new DbIDUCallBack() {
                                         @Override
                                         public void onNotification(boolean result) {
                                             dismissDialog();
@@ -327,7 +327,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
                                                 ToastUtils.showShort("保存免疫记录子表失败");
                                             }
                                         }
-                                    }).insertAsyncBatch(ImmuneBatchDetailEntity.class, detailUploadData);
+                                    });
                                 } else {
                                     onNotifyAllEvent.setValue(true);
                                     onShowDialogEvent.setValue("修改免疫记录成功!");
@@ -336,7 +336,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
                                 ToastUtils.showShort("保存免疫记录失败");
                             }
                         }
-                    }).insertAsyncBatch(ImmuneBatchEntity.class, uploadData);
+                    });
                 }
 
                 @Override
@@ -344,7 +344,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
                     cn.wandersnail.commons.util.ToastUtils.showShort("查询-圈舍牲畜-失败！");
                     dismissDialog();
                 }
-            }).queryAsyncAll(CattleResumeEntity.class, builder);
+            });
 
         } else {
             ToastUtils.showShort("无法对已生成的免疫记录做修改！");

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

@@ -156,7 +156,7 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
         QueryBuilder<MedicalRecordEntity> builder =
                 DbUtil.getInstance().getQueryBuilder(MedicalRecordEntity.class)
                         .where(MedicalRecordEntityDao.Properties.Unid.eq(Configs.resumeId));
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<MedicalRecordEntity>() {
+        DbUtil.getInstance().queryAsyncAll(MedicalRecordEntity.class, builder, new DbQueryCallBack<MedicalRecordEntity>() {
             @Override
             public void onSuccess(List<MedicalRecordEntity> result) {
 
@@ -173,7 +173,7 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
                 onNotifyAllEvent.setValue(true);
                 ToastUtils.showShort("诊疗记录-数据库查询失败");
             }
-        }).queryAsyncAll(MedicalRecordEntity.class, builder);
+        });
 
     }
 
@@ -274,7 +274,7 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
         uploadData = new ArrayList<>();
         uploadData.add(medicalRecordEntity);
 
-        DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+        DbUtil.getInstance().insertAsyncBatch(MedicalRecordEntity.class, uploadData, new DbIDUCallBack() {
             @Override
             public void onNotification(boolean result) {
                 dismissDialog();
@@ -285,7 +285,7 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
                     ToastUtils.showShort("保存诊疗记录失败");
                 }
             }
-        }).insertAsyncBatch(MedicalRecordEntity.class, uploadData);
+        });
 
 
     }

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

@@ -183,7 +183,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
         QueryBuilder<PerformanceEntity> builder =
                 DbUtil.getInstance().getQueryBuilder(PerformanceEntity.class)
                         .where(PerformanceEntityDao.Properties.Unid.eq(Configs.resumeId));
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<PerformanceEntity>() {
+        DbUtil.getInstance().queryAsyncAll(PerformanceEntity.class, builder, new DbQueryCallBack<PerformanceEntity>() {
             @Override
             public void onSuccess(List<PerformanceEntity> result) {
 
@@ -200,7 +200,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
                 onNotifyAllEvent.setValue(true);
                 ToastUtils.showShort("性能测定-数据库查询失败");
             }
-        }).queryAsyncAll(PerformanceEntity.class, builder);
+        });
 
     }
 
@@ -284,7 +284,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
                         .where(PerformanceEntityDao.Properties.Age.eq(performanceEntity.getAge())
                                 , PerformanceEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid)
                         );
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<PerformanceEntity>() {
+        DbUtil.getInstance().queryAsyncAll(PerformanceEntity.class, builder, new DbQueryCallBack<PerformanceEntity>() {
             @Override
             public void onSuccess(List<PerformanceEntity> result) {
 
@@ -304,7 +304,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
             public void onFailed() {
                 ToastUtils.showShort("性能测定月龄数据-数据库查询失败");
             }
-        }).queryAsyncAll(PerformanceEntity.class, builder);
+        });
 
     }
 
@@ -332,7 +332,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
         uploadData = new ArrayList<>();
         uploadData.add(performanceEntity);
 
-        DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+        DbUtil.getInstance().insertAsyncBatch(PerformanceEntity.class, uploadData, new DbIDUCallBack() {
             @Override
             public void onNotification(boolean result) {
                 dismissDialog();
@@ -343,7 +343,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
                     ToastUtils.showShort("保存性能测定失败");
                 }
             }
-        }).insertAsyncBatch(PerformanceEntity.class, uploadData);
+        });
 
 
     }

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

@@ -287,7 +287,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
                 DbUtil.getInstance().getQueryBuilder(WeightManEntity.class)
                         .where(WeightManEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid))
                         .orderDesc(WeightManEntityDao.Properties.WTime);
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<WeightManEntity>() {
+        DbUtil.getInstance().queryAsyncAll(WeightManEntity.class, builder3, new DbQueryCallBack<WeightManEntity>() {
             @Override
             public void onSuccess(List<WeightManEntity> result) {
 
@@ -340,7 +340,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
                 cn.wandersnail.commons.util.ToastUtils.showShort("查询称重记录失败！");
                 dismissDialog();
             }
-        }).queryAsyncAll(WeightManEntity.class, builder3);
+        });
     }
 
 
@@ -435,7 +435,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
                             .where(WeightManEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid)
                                     , WeightManEntityDao.Properties.WTime.eq(weightManEntity.getWTime())
                             );
-            DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<WeightManEntity>() {
+            DbUtil.getInstance().queryAsyncAll(WeightManEntity.class, builder3, new DbQueryCallBack<WeightManEntity>() {
                 @Override
                 public void onSuccess(List<WeightManEntity> result) {
 
@@ -473,7 +473,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
                     cn.wandersnail.commons.util.ToastUtils.showShort("查询称重记录失败！");
                     dismissDialog();
                 }
-            }).queryAsyncAll(WeightManEntity.class, builder3);
+            });
         }
     });
 
@@ -490,7 +490,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
 
     private void queryCattleResume(QueryBuilder<CattleResumeEntity> builder) {
 
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
+        DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
             @Override
             public void onSuccess(List<CattleResumeEntity> result) {
 
@@ -561,7 +561,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
                 onNotifyAllEvent.setValue(true);
                 ToastUtils.showShort("基础档案数据库查询失败");
             }
-        }).queryAsyncAll(CattleResumeEntity.class, builder);
+        });
     }
 
     public void saveWeightMan(WeightManEntity weightManEntity) {
@@ -569,7 +569,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
         uploadData = new ArrayList<>();
         uploadData.add(weightManEntity);
 
-        DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+        DbUtil.getInstance().insertAsyncBatch(WeightManEntity.class, uploadData, new DbIDUCallBack() {
             @Override
             public void onNotification(boolean result) {
                 dismissDialog();
@@ -594,7 +594,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
                     ToastUtils.showShort("保存称重记录失败");
                 }
             }
-        }).insertAsyncBatch(WeightManEntity.class, uploadData);
+        });
 
 
     }

app/src/main/java/com/phlx/anchorcollect/ui/info/CattleVM.java

@@ -78,7 +78,7 @@ public class CattleVM extends BackBarVM<Repository> {
                 DbUtil.getInstance().getQueryBuilder(PerformanceEntity.class)
                         .where(PerformanceEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid))
                         .orderDesc(PerformanceEntityDao.Properties.CreateTime);
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<PerformanceEntity>() {
+        DbUtil.getInstance().queryAsyncAll(PerformanceEntity.class, builder, new DbQueryCallBack<PerformanceEntity>() {
             @Override
             public void onSuccess(List<PerformanceEntity> result) {
 
@@ -93,7 +93,7 @@ public class CattleVM extends BackBarVM<Repository> {
             public void onFailed() {
                 ToastUtils.showShort("性能测定-数据库查询失败");
             }
-        }).queryAsyncAll(PerformanceEntity.class, builder);
+        });
     }
 
     public void queryMedicalRecordList() {
@@ -102,7 +102,7 @@ public class CattleVM extends BackBarVM<Repository> {
                 DbUtil.getInstance().getQueryBuilder(MedicalRecordEntity.class)
                         .where(MedicalRecordEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid))
                         .orderDesc(MedicalRecordEntityDao.Properties.CreateTime);
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<MedicalRecordEntity>() {
+        DbUtil.getInstance().queryAsyncAll(MedicalRecordEntity.class, builder, new DbQueryCallBack<MedicalRecordEntity>() {
             @Override
             public void onSuccess(List<MedicalRecordEntity> result) {
 
@@ -117,7 +117,7 @@ public class CattleVM extends BackBarVM<Repository> {
             public void onFailed() {
                 ToastUtils.showShort("诊疗记录-数据库查询失败");
             }
-        }).queryAsyncAll(MedicalRecordEntity.class, builder);
+        });
     }
 
     public void queryImmunRecordList() {
@@ -125,7 +125,7 @@ public class CattleVM extends BackBarVM<Repository> {
         QueryBuilder<ImmuneBatchDetailEntity> detailBuilder =
                 DbUtil.getInstance().getQueryBuilder(ImmuneBatchDetailEntity.class)
                         .where(ImmuneBatchDetailEntityDao.Properties.CattleresumeUnid.eq(Configs.tempUnid));
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchDetailEntity>() {
+        DbUtil.getInstance().queryAsyncAll(ImmuneBatchDetailEntity.class, detailBuilder, new DbQueryCallBack<ImmuneBatchDetailEntity>() {
             @Override
             public void onSuccess(List<ImmuneBatchDetailEntity> result) {
 
@@ -141,7 +141,7 @@ public class CattleVM extends BackBarVM<Repository> {
                                 DbUtil.getInstance().getQueryBuilder(ImmuneBatchEntity.class)
                                         .where(ImmuneBatchEntityDao.Properties.Unid.in(immuneIds))
                                         .orderDesc(ImmuneBatchEntityDao.Properties.CreateTime);
-                        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchEntity>() {
+                        DbUtil.getInstance().queryAsyncAll(ImmuneBatchEntity.class, builder, new DbQueryCallBack<ImmuneBatchEntity>() {
                             @Override
                             public void onSuccess(List<ImmuneBatchEntity> result) {
 
@@ -156,7 +156,7 @@ public class CattleVM extends BackBarVM<Repository> {
                             public void onFailed() {
                                 ToastUtils.showShort("免疫记录-数据库查询失败");
                             }
-                        }).queryAsyncAll(ImmuneBatchEntity.class, builder);
+                        });
                     }
                 } else {
                     observableRefreshList.setValue(2);
@@ -167,7 +167,7 @@ public class CattleVM extends BackBarVM<Repository> {
             public void onFailed() {
                 ToastUtils.showShort("免疫记录-子表-数据库查询失败");
             }
-        }).queryAsyncAll(ImmuneBatchDetailEntity.class, detailBuilder);
+        });
 
     }
 
@@ -177,7 +177,7 @@ public class CattleVM extends BackBarVM<Repository> {
                 DbUtil.getInstance().getQueryBuilder(BreedingRecordEntity.class)
                         .where(BreedingRecordEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid))
                         .orderDesc(BreedingRecordEntityDao.Properties.CreateTime);
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordEntity>() {
+        DbUtil.getInstance().queryAsyncAll(BreedingRecordEntity.class, builder, new DbQueryCallBack<BreedingRecordEntity>() {
             @Override
             public void onSuccess(List<BreedingRecordEntity> result) {
 
@@ -192,7 +192,7 @@ public class CattleVM extends BackBarVM<Repository> {
             public void onFailed() {
                 ToastUtils.showShort("配种记录主表-数据库查询失败");
             }
-        }).queryAsyncAll(BreedingRecordEntity.class, builder);
+        });
 
     }
 
@@ -204,7 +204,7 @@ public class CattleVM extends BackBarVM<Repository> {
 //                                , BreedingRecordEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
                         )
                         .orderDesc(BreedingRecordEntityDao.Properties.CreateTime);
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordEntity>() {
+        DbUtil.getInstance().queryAsyncAll(BreedingRecordEntity.class, builder, new DbQueryCallBack<BreedingRecordEntity>() {
             @Override
             public void onSuccess(List<BreedingRecordEntity> result) {
 
@@ -216,7 +216,7 @@ public class CattleVM extends BackBarVM<Repository> {
 //                                            , BreedingRecordDetailEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
                                     )
                                     .orderDesc(BreedingRecordDetailEntityDao.Properties.CreateTime);
-                    DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
+                    DbUtil.getInstance().queryAsyncAll(BreedingRecordDetailEntity.class, builder2, new DbQueryCallBack<BreedingRecordDetailEntity>() {
                         @Override
                         public void onSuccess(List<BreedingRecordDetailEntity> result) {
 
@@ -235,7 +235,7 @@ public class CattleVM extends BackBarVM<Repository> {
                         public void onFailed() {
                             ToastUtils.showShort("配种记录子表-数据库查询失败");
                         }
-                    }).queryAsyncAll(BreedingRecordDetailEntity.class, builder2);
+                    });
                 }
             }
 
@@ -243,7 +243,7 @@ public class CattleVM extends BackBarVM<Repository> {
             public void onFailed() {
                 ToastUtils.showShort("配种记录主表-数据库查询失败");
             }
-        }).queryAsyncAll(BreedingRecordEntity.class, builder);
+        });
 
 
     }

app/src/main/java/com/phlx/anchorcollect/ui/labelchange/LabelChangeVM.java

@@ -130,7 +130,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
             return;
         }
         if (!StringUtils.isEmpty(epc.get()) && epc.get().length() > 50) {
-            ToastUtils.showShort("高频耳标长度非法，请重新扫描!");
+            ToastUtils.showShort("电子耳标长度非法，请重新扫描!");
             return;
         }
         if (!StringUtils.isEmpty(noticeNo.get()) && noticeNo.get().length() > 25) {
@@ -143,7 +143,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
         if (checkResult != 0) {
             switch (checkResult) {
                 case 1:
-                    ToastUtils.showShort("高频耳标已存在，请重新扫描！");
+                    ToastUtils.showShort("电子耳标已存在，请重新扫描！");
                     return;
                 case 3:
                     ToastUtils.showShort("可视耳标已存在，请重新填写！");
@@ -163,7 +163,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
         entity.setDeptId(Long.parseLong(SPUtils.getInstance().getString(Configs.SP_DEPT_ID)));
         uploadData.add(entity);
 
-        DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+        DbUtil.getInstance().insertAsyncBatch(CattleResumeEntity.class, uploadData, new DbIDUCallBack() {
             @Override
             public void onNotification(boolean result) {
                 if (result) {
@@ -173,7 +173,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
                     ToastUtils.showShort("保存" + getApplication().getResources().getString(R.string.label_change) + "失败！");
                 }
             }
-        }).insertAsyncBatch(CattleResumeEntity.class, uploadData);
+        });
     }
 
 
@@ -265,7 +265,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
         String sql = sbf.toString();
         WhereCondition.StringCondition stringCondition = new WhereCondition.StringCondition(sql);
 
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
+        DbUtil.getInstance().queryAsync(CattleResumeEntity.class, stringCondition, new DbQueryCallBack<CattleResumeEntity>() {
             @Override
             public void onSuccess(List<CattleResumeEntity> result) {
                 if (result != null && result.size() > 0) {
@@ -282,7 +282,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
                 ToastUtils.showShort("查询数据库失败");
                 finish();
             }
-        }).queryAsync(CattleResumeEntity.class, stringCondition);
+        });
 
     }
 

app/src/main/java/com/phlx/anchorcollect/ui/labelchange/list/ExchangeListVM.java

@@ -68,7 +68,7 @@ public class ExchangeListVM extends BackBarVM<Repository> {
                 DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
                         .where(CattleResumeEntityDao.Properties.Unid.eq(inspectEntities.get(position).getUnid()));
         int finalI = position;
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
+        DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
             @Override
             public void onSuccess(List<CattleResumeEntity> result) {
                 if (result != null && result.size() > 0) {
@@ -88,6 +88,6 @@ public class ExchangeListVM extends BackBarVM<Repository> {
                 cn.wandersnail.commons.util.ToastUtils.showShort("查询基础信息失败！");
                 dismissDialog();
             }
-        }).queryAsyncAll(CattleResumeEntity.class, builder);
+        });
     }
 }

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

@@ -83,8 +83,8 @@ public class LoginVM extends BaseViewModel<Repository> {
 
 //        userName.set("13664793087");
 //        password.set("Abgq3087@");
-//        userName.set("15047917803");
-//        password.set("Tpsq7803*");
+//        userName.set("15047962756");
+//        password.set("Tpsq2756*");
 //        userName.set("13847913985");
 //        password.set("Xlht3985*");
 //        userName.set("ewei");

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

@@ -14,6 +14,7 @@ import com.phlx.anchorcollect.db.gen.DictEntityDao;
 import com.phlx.anchorcollect.db.interf.DbQueryCallBack;
 import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
+import com.phlx.anchorcollect.entity.FrozenSemenEntity;
 import com.phlx.anchorcollect.entity.GenTableColumn;
 import com.phlx.anchorcollect.ui.base.MainBarVM;
 import com.phlx.anchorcollect.util.EntityUtils;
@@ -43,6 +44,7 @@ public class MainVM extends MainBarVM<Repository> {
     public void init() {
 
         Configs.dictList = DbUtil.getInstance().queryAll(DictEntity.class);
+        Configs.frozenSemenList = DbUtil.getInstance().queryAll(FrozenSemenEntity.class);
 
 
     }
@@ -163,7 +165,7 @@ public class MainVM extends MainBarVM<Repository> {
             QueryBuilder<CattleResumeEntity> builder =
                     DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
                             .where(CattleResumeEntityDao.Properties.Unid.eq(Configs.tempUnid));
-            DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
+            DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
                 @Override
                 public void onSuccess(List<CattleResumeEntity> result) {
 
@@ -181,7 +183,7 @@ public class MainVM extends MainBarVM<Repository> {
                 public void onFailed() {
                     ToastUtils.showShort("基础档案数据库查询失败");
                 }
-            }).queryAsyncAll(CattleResumeEntity.class, builder);
+            });
         }
     });
 

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

@@ -12,9 +12,11 @@ import com.phlx.anchorcollect.db.gen.GenTableColumnDao;
 import com.phlx.anchorcollect.db.gen.GenTableDao;
 import com.phlx.anchorcollect.db.interf.DbIDUCallBack;
 import com.phlx.anchorcollect.entity.DictEntity;
+import com.phlx.anchorcollect.entity.FrozenSemenEntity;
 import com.phlx.anchorcollect.entity.GenData;
 import com.phlx.anchorcollect.entity.GenTable;
 import com.phlx.anchorcollect.entity.GenTableColumn;
+import com.phlx.anchorcollect.entity.LoginInfoData;
 import com.phlx.anchorcollect.params.CollectResponse;
 import com.phlx.anchorcollect.params.ListResponse;
 import com.phlx.anchorcollect.params.PostParams;
@@ -61,15 +63,16 @@ public class SplashVM extends MainBarVM<Repository> {
                 .compose(RxUtils.exceptionTransformer())
                 .doOnSubscribe(disposable -> {
                 })
-                .subscribe((Consumer<ListResponse<DictEntity>>) response -> {
+                .subscribe((Consumer<CollectResponse<LoginInfoData>>) response -> {
 
                     if (response.getCode() == 0) {
-                        //清除之前的页面配置
+                        //清除之前的字典项和冻精信息
                         DbUtil.getInstance().deleteAll(DictEntity.class);
+                        DbUtil.getInstance().deleteAll(FrozenSemenEntity.class);
 
-                        if (response.getData() != null && response.getData().size() > 0) {
-                            KLog.e(response.getData().size());
-                            DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+                        if (response.getData() != null && !response.getData().getDictList().isEmpty()) {
+                            KLog.e("getDictList:"+response.getData().getDictList().size());
+                            DbUtil.getInstance().insertAsyncBatch(DictEntity.class, response.getData().getDictList(), new DbIDUCallBack() {
                                 @Override
                                 public void onNotification(boolean result) {
                                     if (result) {
@@ -78,13 +81,26 @@ public class SplashVM extends MainBarVM<Repository> {
                                         errorEvent.setValue("保存字典项数据失败");
                                     }
                                 }
-                            }).insertAsyncBatch(DictEntity.class, response.getData());
-                        } else {
+                            });
+                        }
 
+                        if (response.getData() != null && !response.getData().getFrozenSemenList().isEmpty()) {
+                            KLog.e("getFrozenSemenList:"+response.getData().getFrozenSemenList().size());
+                            DbUtil.getInstance().insertAsyncBatch(FrozenSemenEntity.class, response.getData().getFrozenSemenList(), new DbIDUCallBack() {
+                                @Override
+                                public void onNotification(boolean result) {
+                                    if (result) {
+                                        ToastUtils.showShort("冻精数据同步完成！");
+                                    } else {
+                                        errorEvent.setValue("保存冻精数据失败");
+                                    }
                                 }
+                            });
+                        }
+
                         requestGen();
                     } else {
-                        errorEvent.setValue("同步字典项数据错误 :" + response.getMsg());
+                        errorEvent.setValue("同步登陆信息数据错误 :" + response.getMsg());
                     }
                 }, (Consumer<ResponseThrowable>) throwable -> {
                     dismissDialog();
@@ -116,11 +132,11 @@ public class SplashVM extends MainBarVM<Repository> {
 
                         if (response.getData().getGenTableColumns() != null && response.getData().getGenTables() != null) {
                             KLog.e(response.getData().getGenTables().size() + "|" + response.getData().getGenTableColumns().size());
-                            DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+                            DbUtil.getInstance().insertAsyncBatch(GenTable.class, response.getData().getGenTables(), new DbIDUCallBack() {
                                 @Override
                                 public void onNotification(boolean result) {
                                     if (result) {
-                                        DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
+                                        DbUtil.getInstance().insertAsyncBatch(GenTableColumn.class, response.getData().getGenTableColumns(), new DbIDUCallBack() {
                                             @Override
                                             public void onNotification(boolean result) {
                                                 if (result) {
@@ -129,12 +145,12 @@ public class SplashVM extends MainBarVM<Repository> {
                                                     errorEvent.setValue("保存页面配置详情数据失败");
                                                 }
                                             }
-                                        }).insertAsyncBatch(GenTableColumn.class, response.getData().getGenTableColumns());
+                                        });
                                     } else {
                                         errorEvent.setValue("保存页面配置数据失败");
                                     }
                                 }
-                            }).insertAsyncBatch(GenTable.class, response.getData().getGenTables());
+                            });
                         } else {
                             dismissDialog();
                         }

app/src/main/java/com/phlx/anchorcollect/util/DictUtils.java → app/src/main/java/com/phlx/anchorcollect/util/LoginInfoUtils.java

@@ -2,17 +2,18 @@ package com.phlx.anchorcollect.util;
 
 import com.phlx.anchorcollect.Configs;
 import com.phlx.anchorcollect.entity.DictEntity;
+import com.phlx.anchorcollect.entity.FrozenSemenEntity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class DictUtils {
+public class LoginInfoUtils {
 
-    public static List<String> getDistNameList(String type){
+    public static List<String> getDistNameList(String type) {
 
         List<String> distNames = new ArrayList<>();
-        for (DictEntity de:Configs.dictList) {
-            if(type.equals(de.getDictType())){
+        for (DictEntity de : Configs.dictList) {
+            if (type.equals(de.getDictType())) {
                 distNames.add(de.getDictLabel());
             }
         }
@@ -20,11 +21,11 @@ public class DictUtils {
         return distNames;
     }
 
-    public static List<DictEntity> getDistList(String type){
+    public static List<DictEntity> getDistList(String type) {
 
         List<DictEntity> dists = new ArrayList<>();
-        for (DictEntity de:Configs.dictList) {
-            if(type.equals(de.getDictType())){
+        for (DictEntity de : Configs.dictList) {
+            if (type.equals(de.getDictType())) {
                 dists.add(de);
             }
         }
@@ -32,5 +33,19 @@ public class DictUtils {
         return dists;
     }
 
+    public static FrozenSemenEntity getFrozenSemenForName(String code) {
+        for (FrozenSemenEntity frozenSemenEntity : Configs.frozenSemenList) {
+            String[] infos = frozenSemenEntity.getInfo().split("/");
+            if (infos != null && infos.length > 0) {
+                for (int i = 0; i < infos.length; i++) {
+                    if (infos[i].equals(code)) {
+                        return frozenSemenEntity;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
 
 }

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

@@ -69,7 +69,7 @@
                         android:layout_height="@dimen/dp_40"
                         android:gravity="center_vertical"
                         android:layout_marginTop="@dimen/dp_5"
-                        android:text="高频耳标"
+                        android:text="电子耳标"
                         android:textColor="@color/black"
                         android:textSize="@dimen/desc_text_size" />