1.增加根据cpu型号选择上电方式；

2.修复配种显示bug;
3.修改牛只详情中，配种记录列表显示改为主表加子表

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.phlx.anchorcollect"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 8
-        versionName "2.0.2"
+        versionCode 9
+        versionName "2.0.3"
 
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -48,7 +48,7 @@ android {
 }
 
 greendao {
-    schemaVersion 3 //数据库版本号
+    schemaVersion 5 //数据库版本号
     daoPackage 'com.phlx.anchorcollect.db.gen'
     targetGenDir 'src/main/java'
 }

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

@@ -6,6 +6,7 @@ import android.graphics.Typeface;
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.style.KongzueStyle;
 import com.phlx.anchorcollect.entity.DictEntity;
+import com.phlx.anchorcollect.util.DeviceIdUtils;
 import com.uhf.linkage.Linkage;
 
 import cn.wandersnail.ble.EasyBLE;
@@ -43,6 +44,9 @@ public class App extends BaseApplication {
         //实例化并初始化
 //        EasyBLE.getInstance().initialize(this)
         BTManager.getInstance().initialize(this);
+
+        Configs.cpuName = DeviceIdUtils.getCpuName();
+
     }
 
     public static App getInstance() {

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

@@ -112,6 +112,7 @@ public class Configs {
     public static List<GenTableColumn> medicalrecords;
     public static List<GenTableColumn> immunebatch;
     public static List<GenTableColumn> cattlematingMaster;
+    public static List<GenTableColumn> cattlematingMasterList;
     public static List<GenTableColumn> cattlematingDetaill;
     public static List<GenTableColumn> cattlematingDetaillList;
 
@@ -135,6 +136,11 @@ public class Configs {
 
     public static String currentEvent;//控制接受重量数据的页面
 
+    public static String cpuName = "";
+
+    public static String raiseVarieties = "";
+    public static String deptName = "";
+
 
 
 //    public static boolean ISCONNECTED;

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

@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 3): knows all DAOs.
+ * Master of DAO (schema version 5): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 3;
+    public static final int SCHEMA_VERSION = 5;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {

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

@@ -71,6 +71,16 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
      */
     private String pregnancy;
 
+    /**
+     * 饲养品种（利木赞;西门塔尔等）
+     */
+    private String raiseVarieties;
+
+    /**
+     * 所属种畜站
+     */
+    private String breedingPlantId;
+
     /**
      * 部门id
      */
@@ -129,6 +139,8 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
         backLoveDate = in.readString();
         dueDate = in.readString();
         pregnancy = in.readString();
+        raiseVarieties = in.readString();
+        breedingPlantId = in.readString();
         if (in.readByte() == 0) {
             deptId = null;
         } else {
@@ -148,11 +160,12 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
         remark = in.readString();
     }
 
-    @Generated(hash = 1961071723)
+    @Generated(hash = 1766058193)
     public BreedingRecordDetailEntity(Long unid, Long fUnid, String matingStyle, Long cattleresumeId,
             String frozenSemenBatch, String matingDate, String isReturn, String backLoveDate, String dueDate,
-            String pregnancy, Long deptId, Long caId, String uploadStatus, String searchValue, String createBy,
-            String createTime, String updateBy, String updateTime, String remark) {
+            String pregnancy, String raiseVarieties, String breedingPlantId, Long deptId, Long caId,
+            String uploadStatus, String searchValue, String createBy, String createTime, String updateBy,
+            String updateTime, String remark) {
         this.unid = unid;
         this.fUnid = fUnid;
         this.matingStyle = matingStyle;
@@ -163,6 +176,8 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
         this.backLoveDate = backLoveDate;
         this.dueDate = dueDate;
         this.pregnancy = pregnancy;
+        this.raiseVarieties = raiseVarieties;
+        this.breedingPlantId = breedingPlantId;
         this.deptId = deptId;
         this.caId = caId;
         this.uploadStatus = uploadStatus;
@@ -201,6 +216,8 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
         dest.writeString(backLoveDate);
         dest.writeString(dueDate);
         dest.writeString(pregnancy);
+        dest.writeString(raiseVarieties);
+        dest.writeString(breedingPlantId);
         if (deptId == null) {
             dest.writeByte((byte) 0);
         } else {
@@ -319,6 +336,22 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
         this.pregnancy = pregnancy;
     }
 
+    public String getRaiseVarieties() {
+        return raiseVarieties;
+    }
+
+    public void setRaiseVarieties(String raiseVarieties) {
+        this.raiseVarieties = raiseVarieties;
+    }
+
+    public String getBreedingPlantId() {
+        return breedingPlantId;
+    }
+
+    public void setBreedingPlantId(String breedingPlantId) {
+        this.breedingPlantId = breedingPlantId;
+    }
+
     public Long getDeptId() {
         return deptId;
     }
@@ -404,6 +437,8 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
                 ", backLoveDate='" + backLoveDate + '\'' +
                 ", dueDate='" + dueDate + '\'' +
                 ", pregnancy='" + pregnancy + '\'' +
+                ", raiseVarieties='" + raiseVarieties + '\'' +
+                ", breedingPlantId='" + breedingPlantId + '\'' +
                 ", deptId=" + deptId +
                 ", caId=" + caId +
                 ", uploadStatus='" + uploadStatus + '\'' +

app/src/main/java/com/phlx/anchorcollect/net/RetrofitClient.java

@@ -52,7 +52,7 @@ public class RetrofitClient {
     public static String baseUrl =
         "serve.xlglmnmyzspt.org.cn"//正式
 //        "39.101.170.186"//阿里云测试
-//            "192.168.8.135"//董
+//            "192.168.1.80"//董
 //            "192.168.43.154"//张敏
             ;
     public static String port =

app/src/main/java/com/phlx/anchorcollect/rfid/DeviceControl.java

 package com.phlx.anchorcollect.rfid;
 
+import android.os.SystemClock;
+
+import com.phlx.anchorcollect.Configs;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -13,42 +17,96 @@ class DeviceControl {
 
     void PowerOnDevice() {
 
+        switch (Configs.cpuName) {
+
+            case "MT6735":
                 try {
-            //RM_7088_MT2
-            //手持机
-//            WriteFile("/sys/class/misc/mtgpio/pin", "-wdout94 1");
+                    //手持机 RM_7088_MT2
+                    WriteFile("/sys/class/misc/mtgpio/pin", "-wdout94 1");
+                    Thread.sleep(300);
+
+                } catch (IOException | InterruptedException e) {
+                    e.printStackTrace();
+                }
+                break;
+
+            case "MT6762V/CB":
+                try {
+                    //pad RM_WIOT61c_S1
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "out 24 1");
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "mode 24 0");
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "dir 24 1");
+
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "out 55 1");
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "mode 55 0");
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "dir 55 1");
 
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "out 173 1");
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "mode 173 0");
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "dir 173 1");
+                    SystemClock.sleep(500);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                break;
+
+            case "MT6763V/B":
+                try {
                     //pad RM_SD100T_MT1
                     WriteFile("/sys/bus/platform/drivers/mediatek-pinctrl/10005000.pinctrl/mt_gpio", "mode75 0");
                     WriteFile("/sys/bus/platform/drivers/mediatek-pinctrl/10005000.pinctrl/mt_gpio", "out75 1");
                     WriteFile("/sys/bus/platform/drivers/mediatek-pinctrl/10005000.pinctrl/mt_gpio", "out55 1");
 
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                break;
+        }
+
         //RM_SD100T_MT1
 //            WriteFile("/sys/bus/platform/drivers/mediatek-pinctrl/10005000.pinctrl/mt_gpio", "out55 1");
 
-            Thread.sleep(300);
-
-        } catch (IOException | InterruptedException e) {
-            e.printStackTrace();
-        }
     }
 
     void PowerOffDevice() {
 
+
+        switch (Configs.cpuName) {
+
+            case "MT6735":
                 try {
-            //RM_7088_MT2
-            //手持机
-//            WriteFile("/sys/class/misc/mtgpio/pin", "-wdout94 0");
+                    //手持机 RM_7088_MT2
+                    WriteFile("/sys/class/misc/mtgpio/pin", "-wdout94 0");
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                break;
 
+            case "MT6762V/CB":
+                try {
+                    //RM_WIOT61c_S1
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "out 24 0");
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "out 55 0");
+                    WriteFile("/sys/devices/platform/pinctrl/mt_gpio", "out 173 0");
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                break;
+
+            case "MT6763V/B":
+                try {
                     //pad RM_SD100T_MT1
                     WriteFile("/sys/bus/platform/drivers/mediatek-pinctrl/10005000.pinctrl/mt_gpio", "out75 0");
                     WriteFile("/sys/bus/platform/drivers/mediatek-pinctrl/10005000.pinctrl/mt_gpio", "out55 0");
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                break;
+
 
             //RM_SD100T_MT1
 //            WriteFile("/sys/bus/platform/drivers/mediatek-pinctrl/10005000.pinctrl/mt_gpio", "out55 0");
 
-        } catch (IOException e) {
-            e.printStackTrace();
         }
     }
 

app/src/main/java/com/phlx/anchorcollect/rfid/ModuleManager.java

@@ -2,16 +2,35 @@ package com.phlx.anchorcollect.rfid;
 
 
 import com.phlx.anchorcollect.App;
+import com.phlx.anchorcollect.Configs;
 import com.uhf.structures.Rfid_Value;
 
 public class ModuleManager {
 
+    private static String serialPort = "/dev/ttyMT1";
+
     public static int openCom() {
-        //手持机
-//        return App.getInstance().getLinkage().open_serial("/dev/ttyMT2");
 
-        //pad
-        return App.getInstance().getLinkage().open_serial("/dev/ttyMT1");
+        switch (Configs.cpuName) {
+
+            //手持机 RM_7088_MT2
+            case "MT6735":
+                serialPort = "/dev/ttyMT2";
+                break;
+
+            //pad RM_WIOT61c_S1
+            case "MT6762V/CB":
+                serialPort = "/dev/ttyS1";
+                break;
+
+            //pad RM_SD100T_MT1
+            case "MT6763V/B":
+                serialPort = "/dev/ttyMT1";
+                break;
+        }
+
+
+        return App.getInstance().getLinkage().open_serial(serialPort);
     }
 
     public static void destroyLibSO() {

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

@@ -67,6 +67,7 @@ import me.goldze.mvvmhabit.bus.event.SingleLiveEvent;
 import me.goldze.mvvmhabit.http.ResponseThrowable;
 import me.goldze.mvvmhabit.utils.KLog;
 import me.goldze.mvvmhabit.utils.RxUtils;
+import me.goldze.mvvmhabit.utils.SPUtils;
 import me.goldze.mvvmhabit.utils.StringUtils;
 import me.goldze.mvvmhabit.utils.ToastUtils;
 import me.tatarka.bindingcollectionadapter2.ItemBinding;
@@ -422,6 +423,17 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
                     rfid.set(Configs.tempRfid);
                     remarkParamEntity.setShowName(result.get(0).getRemark());
 
+                    //查询牛的品种和所属种蓄站
+                    Configs.deptName = SPUtils.getInstance().getString(Configs.SP_DEPT_NAME, "");
+                    QueryBuilder<DictEntity> builder2 =
+                            DbUtil.getInstance().getQueryBuilder(DictEntity.class)
+                                    .where(DictEntityDao.Properties.DictType.eq("zxgl_cattle_raiseVarieties")
+                                            , DictEntityDao.Properties.DictValue.eq(result.get(0).getRaiseVarieties()));
+                    List<DictEntity> dictEntities2 = DbUtil.getInstance().queryAll(DictEntity.class, builder2);
+                    if (dictEntities2 != null && dictEntities2.size() > 0) {
+                        Configs.raiseVarieties = dictEntities2.get(0).getDictLabel();
+                    }
+
                     queryGainWeight();
 
                     String[] filedName = EntityUtils.getFiledName(result.get(0));

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

@@ -132,40 +132,12 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
     }
 
     public void initBreedingRecord() {
-        raiseVarieties.set("");
-        deptName.set(SPUtils.getInstance().getString(Configs.SP_DEPT_NAME, ""));
-        //查询牛的品种和所属种蓄站
-        QueryBuilder<CattleResumeEntity> builder1 =
-                DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
-                        .where(CattleResumeEntityDao.Properties.Unid.eq(Configs.tempUnid));
-        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
-            @Override
-            public void onSuccess(List<CattleResumeEntity> result) {
-
-                if (result != null && result.size() > 0) {
-                    CattleResumeEntity cattleResumeEntity = result.get(0);
+        raiseVarieties.set(Configs.raiseVarieties);
+        deptName.set(Configs.deptName);
 
-                    QueryBuilder<DictEntity> builder =
-                            DbUtil.getInstance().getQueryBuilder(DictEntity.class)
-                                    .where(DictEntityDao.Properties.DictType.eq("zxgl_cattle_raiseVarieties")
-                                            , DictEntityDao.Properties.DictValue.eq(cattleResumeEntity.getRaiseVarieties()));
-                    List<DictEntity> dictEntities = DbUtil.getInstance().queryAll(DictEntity.class, builder);
-                    if (dictEntities != null && dictEntities.size() > 0) {
-                        raiseVarieties.set(dictEntities.get(0).getDictLabel());
         queryBreedingRecord();
-                    }
-                }
-
 //        onNotifyAllEvent.setValue(true);
-                ToastUtils.showShort("查询-种蓄品种于所属种蓄站-成功!");
-            }
 
-            @Override
-            public void onFailed() {
-                onNotifyAllEvent.setValue(true);
-                ToastUtils.showShort("种蓄品种于所属种蓄站-数据库查询失败");
-            }
-        }).queryAsyncAll(CattleResumeEntity.class, builder1);
     }
 
     public void queryBreedingRecord() {
@@ -326,9 +298,10 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
 
         QueryBuilder<BreedingRecordDetailEntity> builder =
                 DbUtil.getInstance().getQueryBuilder(BreedingRecordDetailEntity.class)
-                        .where(BreedingRecordDetailEntityDao.Properties.CaId.eq(breedingRecordEntity.getCattleresumeId())
-                                , BreedingRecordDetailEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
-                        );
+                        .where(BreedingRecordDetailEntityDao.Properties.FUnid.eq(breedingRecordEntity.getUnid())
+//                                , BreedingRecordDetailEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
+                        )
+                        .orderDesc(BreedingRecordDetailEntityDao.Properties.CreateTime);
         DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
             @Override
             public void onSuccess(List<BreedingRecordDetailEntity> result) {

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

@@ -303,7 +303,7 @@ public class CattleActivity extends BaseActivity<AvtivityCattleBinding, CattleVM
         //初始化表头
         List<String> headerStr = new ArrayList<>();
         List<String> fieldNameStr = new ArrayList<>();
-        for (GenTableColumn gtc : Configs.cattlematingDetaillList) {
+        for (GenTableColumn gtc : Configs.cattlematingMasterList) {
             if ("1".equals(gtc.getIsList())) {
                 headerStr.add(gtc.getColumnComment());
                 fieldNameStr.add(gtc.getJavaField());

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

@@ -198,10 +198,22 @@ public class CattleVM extends BackBarVM<Repository> {
 
     public void queryBreedingRecordDetailList() {
 
-        QueryBuilder<BreedingRecordDetailEntity> builder =
+        QueryBuilder<BreedingRecordEntity> builder =
+                DbUtil.getInstance().getQueryBuilder(BreedingRecordEntity.class)
+                        .where(BreedingRecordEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid)
+//                                , BreedingRecordEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
+                        )
+                        .orderDesc(BreedingRecordEntityDao.Properties.CreateTime);
+        DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordEntity>() {
+            @Override
+            public void onSuccess(List<BreedingRecordEntity> result) {
+
+                if (result != null && result.size() > 0) {
+                    //查询子表
+                    QueryBuilder<BreedingRecordDetailEntity> builder2 =
                             DbUtil.getInstance().getQueryBuilder(BreedingRecordDetailEntity.class)
-                        .where(BreedingRecordDetailEntityDao.Properties.CaId.eq(Configs.tempUnid)
-                                , BreedingRecordDetailEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
+                                    .where(BreedingRecordDetailEntityDao.Properties.FUnid.eq(result.get(0).getUnid())
+//                                            , BreedingRecordDetailEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
                                     )
                                     .orderDesc(BreedingRecordDetailEntityDao.Properties.CreateTime);
                     DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
@@ -211,6 +223,10 @@ public class CattleVM extends BackBarVM<Repository> {
                             breedingRecordDetailEntityList = new ArrayList<>();
                             if (result != null && result.size() > 0) {
                                 breedingRecordDetailEntityList = result;
+                                for (BreedingRecordDetailEntity detailEntity:breedingRecordDetailEntityList) {
+                                    detailEntity.setRaiseVarieties(Configs.raiseVarieties);
+                                    detailEntity.setBreedingPlantId(Configs.deptName);
+                                }
                             }
                             observableRefreshList.setValue(3);
                         }
@@ -219,7 +235,17 @@ public class CattleVM extends BackBarVM<Repository> {
                         public void onFailed() {
                             ToastUtils.showShort("配种记录子表-数据库查询失败");
                         }
-        }).queryAsyncAll(BreedingRecordDetailEntity.class, builder);
+                    }).queryAsyncAll(BreedingRecordDetailEntity.class, builder2);
+                }
+            }
+
+            @Override
+            public void onFailed() {
+                ToastUtils.showShort("配种记录主表-数据库查询失败");
+            }
+        }).queryAsyncAll(BreedingRecordEntity.class, builder);
+
+
     }
 
     public List<PerformanceEntity> getPerformanceEntityList() {
@@ -463,7 +489,7 @@ public class CattleVM extends BackBarVM<Repository> {
             String[] filedName = EntityUtils.getFiledName(pe);
             for (String name : filedName) {
 
-                for (GenTableColumn gtc : Configs.cattlematingDetaillList) {
+                for (GenTableColumn gtc : Configs.cattlematingMasterList) {
 
                     if (name.equals(gtc.getJavaField())) {
                         try {
@@ -497,7 +523,7 @@ public class CattleVM extends BackBarVM<Repository> {
 
             //再把格式bean里的数据转换为数据bean
             JsonObject jsonObject = new JsonObject();
-            for (GenTableColumn gtc : Configs.cattlematingDetaillList) {
+            for (GenTableColumn gtc : Configs.cattlematingMasterList) {
                 //防止转json类型错误
                 if ("".equals(gtc.getContent())) {
                     switch (gtc.getJavaType()) {

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

@@ -31,6 +31,7 @@ import com.phlx.anchorcollect.util.TextUtil;
 
 import org.greenrobot.greendao.query.QueryBuilder;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -113,7 +114,7 @@ public class LoginVM extends BaseViewModel<Repository> {
     public BindingCommand loginOnClickCommand = new BindingCommand(new BindingAction() {
         @Override
         public void call() {
-            if(Integer.parseInt(DateUtils.getYear())<2020){
+            if (Integer.parseInt(DateUtils.getYear()) < 2020) {
                 dateEvent.call();
                 return;
             }
@@ -299,6 +300,14 @@ public class LoginVM extends BaseViewModel<Repository> {
                                             , GenTableColumnDao.Properties.IsQuery.eq("1"))
                                     .orderAsc(GenTableColumnDao.Properties.Sort);
                     Configs.cattlematingMaster = DbUtil.getInstance().queryAll(GenTableColumn.class, builderDetaile5);
+                    //取主表列表表头
+                    QueryBuilder<GenTableColumn> builderDetaile9 =
+                            DbUtil.getInstance().getQueryBuilder(GenTableColumn.class)
+                                    .where(GenTableColumnDao.Properties.TableId.eq(gt.getTableId())
+                                            , GenTableColumnDao.Properties.IsList.eq("1")
+                                    )
+                                    .orderAsc(GenTableColumnDao.Properties.Sort);
+                    Configs.cattlematingMasterList = DbUtil.getInstance().queryAll(GenTableColumn.class, builderDetaile9);
                     break;
                 case "zxgl_cattlemating_detaill":
                     QueryBuilder<GenTableColumn> builderDetaile6 =
@@ -320,6 +329,11 @@ public class LoginVM extends BaseViewModel<Repository> {
             }
 
         }
+        if (Configs.cattlematingMasterList == null) {
+            Configs.cattlematingMasterList = new ArrayList<>();
+        }
+        if (Configs.cattlematingDetaillList != null)
+            Configs.cattlematingMasterList.addAll(Configs.cattlematingDetaillList);
 
         dismissDialog();
         ToastUtils.showShort("页面配置详情数据读取完成！");

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

@@ -140,10 +140,10 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
         //默认设置R2000连接
 //        connectManger.setModuleR2000();`
 
-        App.getInstance().getLinkage().stopInventory();
-        SystemClock.sleep(200);
-        //下电
-        ModuleManager.powerOff();
+//        App.getInstance().getLinkage().stopInventory();
+//        SystemClock.sleep(200);
+//        //下电
+//        ModuleManager.powerOff();
 
         App.getInstance().getLinkage().setRFConnectMode(0);
         App.getInstance().getLinkage().setRFModuleType(0);//R2000 0,R2000plus 3

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

@@ -9,10 +9,18 @@ import com.phlx.anchorcollect.App;
 import com.phlx.anchorcollect.Configs;
 import com.phlx.anchorcollect.data.Repository;
 import com.phlx.anchorcollect.db.DbUtil;
+import com.phlx.anchorcollect.db.gen.CattleResumeEntityDao;
+import com.phlx.anchorcollect.db.gen.DictEntityDao;
+import com.phlx.anchorcollect.db.interf.DbQueryCallBack;
+import com.phlx.anchorcollect.entity.CattleResumeEntity;
 import com.phlx.anchorcollect.entity.DictEntity;
 import com.phlx.anchorcollect.ui.base.MainBarVM;
 import com.uhf.structures.FilterParams;
 
+import org.greenrobot.greendao.query.QueryBuilder;
+
+import java.util.List;
+
 import me.goldze.mvvmhabit.binding.command.BindingAction;
 import me.goldze.mvvmhabit.binding.command.BindingCommand;
 import me.goldze.mvvmhabit.bus.event.SingleLiveEvent;
@@ -33,6 +41,7 @@ public class MainVM extends MainBarVM<Repository> {
 
         Configs.dictList = DbUtil.getInstance().queryAll(DictEntity.class);
 
+
     }
 
     public void initToolbar(String title) {
@@ -42,9 +51,9 @@ public class MainVM extends MainBarVM<Repository> {
 
     }
 
-    public void setInventoryStatus(){
+    public void setInventoryStatus() {
         Configs.inventoryStatus = SPUtils.getInstance().getBoolean(Configs.SP_INVENTORY_STATUS, false);
-        if(!Configs.inventoryStatus){
+        if (!Configs.inventoryStatus) {
             setSpecialInventoryFilter();
         }
     }

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

@@ -24,6 +24,7 @@ import com.phlx.anchorcollect.util.StringUtil;
 
 import org.greenrobot.greendao.query.QueryBuilder;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -216,6 +217,14 @@ public class SplashVM extends MainBarVM<Repository> {
                                             , GenTableColumnDao.Properties.IsQuery.eq("1"))
                                     .orderAsc(GenTableColumnDao.Properties.Sort);
                     Configs.cattlematingMaster = DbUtil.getInstance().queryAll(GenTableColumn.class, builderDetaile5);
+                    //取主表列表表头
+                    QueryBuilder<GenTableColumn> builderDetaile9 =
+                            DbUtil.getInstance().getQueryBuilder(GenTableColumn.class)
+                                    .where(GenTableColumnDao.Properties.TableId.eq(gt.getTableId())
+                                            , GenTableColumnDao.Properties.IsList.eq("1")
+                                    )
+                                    .orderAsc(GenTableColumnDao.Properties.Sort);
+                    Configs.cattlematingMasterList = DbUtil.getInstance().queryAll(GenTableColumn.class, builderDetaile9);
                     break;
                 case "zxgl_cattlemating_detaill":
                     QueryBuilder<GenTableColumn> builderDetaile6 =
@@ -237,6 +246,11 @@ public class SplashVM extends MainBarVM<Repository> {
             }
 
         }
+        if (Configs.cattlematingMasterList == null) {
+            Configs.cattlematingMasterList = new ArrayList<>();
+        }
+        if (Configs.cattlematingDetaillList != null)
+            Configs.cattlematingMasterList.addAll(Configs.cattlematingDetaillList);
 
         dismissDialog();
         ToastUtils.showShort("页面配置详情数据更新完成！");

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

@@ -206,4 +206,33 @@ public class DeviceIdUtils {
             return null;
         }
     }
+
+
+    public static String getCpuName() {
+        String str1 = "/proc/cpuinfo";
+        String str2 = "";
+        String cpuName = "";
+
+        try {
+            FileReader fileReader = new FileReader(str1);
+            BufferedReader bufferedReader = new BufferedReader(fileReader);
+
+            while ((str2 = bufferedReader.readLine()) != null) {
+                if (TextUtils.isEmpty(str2)) {
+                    continue;
+                }
+                String[] arrayOfString = str2.split(":\\s+", 2);
+                if (TextUtils.equals(arrayOfString[0].trim(), "Hardware")) {
+                    cpuName = arrayOfString[1];
+                    break;
+                }
+            }
+
+            bufferedReader.close();
+            fileReader.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return cpuName;
+    }
 }