Skip to content

A
AnchorCollect_p
Commit 17486fe8 authored by hywang's avatar hywang
Browse files
Options

1.增加单选和时间的默认值； 

2.标签重复提示对换标签位置；
3.基础信息，养殖类型写死。
parent 8e191b0a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 239 additions and 77 deletions
app/build.gradle
View file @ 17486fe8
......@@ -9,8 +9,8 @@ android {
applicationId "com.phlx.anchorcollect_p"
minSdkVersion 21
targetSdkVersion 29
versionCode 22
versionName "2.3.1"
versionCode 23
versionName "2.3.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
......@@ -50,7 +50,7 @@ android {
}
greendao {
schemaVersion 6 //数据库版本号
schemaVersion 7 //数据库版本号
daoPackage 'com.phlx.anchorcollect_p.db.gen'
targetGenDir 'src/main/java'
}
......
app/src/main/java/com/phlx/anchorcollect_p/db/gen/DaoMaster.java
View file @ 17486fe8
......@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
* Master of DAO (schema version 6): knows all DAOs.
* Master of DAO (schema version 7): knows all DAOs.
*/
public class DaoMaster extends AbstractDaoMaster {
public static final int SCHEMA_VERSION = 6;
public static final int SCHEMA_VERSION = 7;
/** Creates underlying database table using DAOs. */
public static void createAllTables(Database db, boolean ifNotExists) {
......
app/src/main/java/com/phlx/anchorcollect_p/entity/CattleResumeEntity.java
View file @ 17486fe8
......@@ -135,6 +135,21 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
/** 犊牛毛色 */
private String colour;
/**
* 是否有角
*/
private String isJiao;
/**
* 是否自繁
*/
private String isZifan;
/**
* 入场日期
*/
private String inTime;
/** 时间戳 */
private String inputTime;
......@@ -224,6 +239,9 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
age = in.readInt();
}
colour = in.readString();
isJiao = in.readString();
isZifan = in.readString();
inTime = in.readString();
inputTime = in.readString();
if (in.readByte() == 0) {
deptId = null;
......@@ -239,7 +257,7 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
remark = in.readString();
}
@Generated(hash = 748489987)
@Generated(hash = 685246161)
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,
......@@ -247,8 +265,9 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
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, String uploadStatus, String uploadTime, String createBy,
String createTime, String updateBy, String updateTime, String remark) {
String isJiao, String isZifan, String inTime, String inputTime, Long deptId,
String uploadStatus, String uploadTime, String createBy, String createTime, String updateBy,
String updateTime, String remark) {
this.unid = unid;
this.registrationNo = registrationNo;
this.individualNo = individualNo;
......@@ -286,6 +305,9 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this.isOut = isOut;
this.age = age;
this.colour = colour;
this.isJiao = isJiao;
this.isZifan = isZifan;
this.inTime = inTime;
this.inputTime = inputTime;
this.deptId = deptId;
this.uploadStatus = uploadStatus;
......@@ -361,6 +383,9 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
dest.writeInt(age);
}
dest.writeString(colour);
dest.writeString(isJiao);
dest.writeString(isZifan);
dest.writeString(inTime);
dest.writeString(inputTime);
if (deptId == null) {
dest.writeByte((byte) 0);
......@@ -690,6 +715,30 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this.colour = colour;
}
public String getIsJiao() {
return isJiao;
}
public void setIsJiao(String isJiao) {
this.isJiao = isJiao;
}
public String getIsZifan() {
return isZifan;
}
public void setIsZifan(String isZifan) {
this.isZifan = isZifan;
}
public String getInTime() {
return inTime;
}
public void setInTime(String inTime) {
this.inTime = inTime;
}
public String getInputTime() {
return inputTime;
}
......@@ -802,6 +851,9 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
", isOut=" + isOut +
", age=" + age +
", colour='" + colour + '\'' +
", isJiao='" + isJiao + '\'' +
", isZifan='" + isZifan + '\'' +
", inTime='" + inTime + '\'' +
", inputTime='" + inputTime + '\'' +
", deptId=" + deptId +
", uploadStatus='" + uploadStatus + '\'' +
......@@ -853,6 +905,9 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this.isOut= cre.getIsOut();
this.age= cre.getAge();
this.colour= cre.getColour();
this.isJiao= cre.getIsJiao();
this.isZifan= cre.getIsZifan();
this.inTime= cre.getInTime();
this.inputTime= cre.getInputTime();
this.deptId= cre.getDeptId();
this.uploadStatus= cre.getUploadStatus();
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/BasicsCollectVM.java
View file @ 17486fe8
......@@ -172,7 +172,10 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
public void initGen() {
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.cattleresume) {
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
CollectGridItem cgi = new CollectGridItem(this, gtc, Configs.BASE_ARCHIVES);
observableList.add(cgi);
}
......@@ -419,10 +422,9 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
// Configs.tempCattleResume.setPhotoPath(markeImgUrl);
String[] filedName = EntityUtils.getFiledName(result.get(0));
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (String name : filedName) {
for (GenTableColumn gtc : Configs.cattleresume) {
if (name.equals(gtc.getJavaField())) {
try {
// Log.e("key:", name);
......@@ -448,8 +450,8 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
e.printStackTrace();
}
}
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
}
onNotifyAllEvent.setValue(false);
......@@ -509,6 +511,12 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
// if (Configs.tempCattleResume.getPhotoPath() != null && !Configs.tempCattleResume.getPhotoPath().equals("")) {
// cattleResumeEntity.setPhoto(BaseImageUtils.bitmapToString(Configs.tempCattleResume.getPhotoPath(), getApplication()));
// }
//如果是自繁默认成出生日期
if("Y".equals(cattleResumeEntity.getIsZifan()) && !StringUtils.isEmpty(cattleResumeEntity.getBirthdate())){
cattleResumeEntity.setInTime(cattleResumeEntity.getBirthdate());
}
//设置饲养类型为02
cattleResumeEntity.setRaiseType("02");
cattleResumeEntity.setPhotoPath(Configs.tempCattleResume.getPhotoPath());
cattleResumeEntity.setDeptId(Long.parseLong(SPUtils.getInstance().getString(Configs.SP_DEPT_ID)));
cattleResumeEntity.setRegistrationNo(rfid.get());
......@@ -619,9 +627,11 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
remarkParamEntity.setContent("");
remarkParamEntity.setShowName("");
currentParamEntity = new GenTableColumn();
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.cattleresume) {
gtc.setShowName("");
gtc.setContent("");
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/BreedingRecordVM.java
View file @ 17486fe8
......@@ -30,6 +30,7 @@ import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.ui.fragment.list.CollectGridItem;
import com.phlx.anchorcollect_p.util.DateUtils;
import com.phlx.anchorcollect_p.util.EntityUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import org.greenrobot.greendao.query.QueryBuilder;
......@@ -108,11 +109,13 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
+ "anchorCiq" + tag + ".jpg";
imgFile = new File(imgUrl);
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.cattlematingMaster) {
CollectGridItem cgi = new CollectGridItem(this, gtc, Configs.BREEDING_RECORD);
observableList.add(cgi);
}
for (GenTableColumn gtc : Configs.cattlematingDetaill) {
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
CollectGridItem cgi = new CollectGridItem(this, gtc, Configs.BREEDING_RECORD_DETAIL);
detailObservableList.add(cgi);
}
......@@ -283,10 +286,9 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
remarkParamEntity.setContent(brdEntity.getRemark());
String[] filedName = EntityUtils.getFiledName(brdEntity);
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (String name : filedName) {
for (GenTableColumn gtc : Configs.cattlematingDetaill) {
if (name.equals(gtc.getJavaField())) {
try {
Object fieldValueByName = EntityUtils.getFieldValueByName(name, brdEntity);
......@@ -311,6 +313,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
e.printStackTrace();
}
}
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
}
onNotifyAllEvent.setValue(false);
......@@ -631,9 +634,11 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
remarkParamEntity.setShowName("");
currentParamEntity = new GenTableColumn();
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.cattlematingDetaill) {
gtc.setShowName("");
gtc.setContent("");
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
}
}
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/ImmunRecordVM.java
View file @ 17486fe8
......@@ -28,6 +28,7 @@ import com.phlx.anchorcollect_p.entity.ImmuneBatchDetailEntity;
import com.phlx.anchorcollect_p.entity.ImmuneBatchEntity;
import com.phlx.anchorcollect_p.ui.fragment.list.CollectGridItem;
import com.phlx.anchorcollect_p.util.EntityUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import org.greenrobot.greendao.query.QueryBuilder;
......@@ -94,7 +95,9 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
+ "anchorCiq" + tag + ".jpg";
imgFile = new File(imgUrl);
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.immunebatch) {
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
CollectGridItem cgi = new CollectGridItem(this, gtc, Configs.IMMUN_RECORD);
observableList.add(cgi);
}
......@@ -117,10 +120,9 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
remarkParamEntity.setContent(immuneBatchEntity.getRemark());
String[] filedName = EntityUtils.getFiledName(immuneBatchEntity);
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (String name : filedName) {
for (GenTableColumn gtc : Configs.immunebatch) {
if (name.equals(gtc.getJavaField())) {
try {
Object fieldValueByName = EntityUtils.getFieldValueByName(name, immuneBatchEntity);
......@@ -144,6 +146,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
} catch (IllegalAccessException e) {
e.printStackTrace();
}
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
}
......@@ -352,9 +355,11 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
remarkParamEntity.setShowName("");
currentParamEntity = new GenTableColumn();
uuid = 0;
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.immunebatch) {
gtc.setShowName("");
gtc.setContent("");
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/MedicalRecordVM.java
View file @ 17486fe8
......@@ -25,6 +25,7 @@ import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.entity.MedicalRecordEntity;
import com.phlx.anchorcollect_p.ui.fragment.list.CollectGridItem;
import com.phlx.anchorcollect_p.util.EntityUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import org.greenrobot.greendao.query.QueryBuilder;
......@@ -91,7 +92,9 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
+ "anchorCiq" + tag + ".jpg";
imgFile = new File(imgUrl);
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.medicalrecords) {
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
CollectGridItem cgi = new CollectGridItem(this, gtc, Configs.TREATMENT_RECORD);
observableList.add(cgi);
}
......@@ -114,6 +117,7 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
remarkParamEntity.setContent(medicalRecordEntity.getRemark());
String[] filedName = EntityUtils.getFiledName(medicalRecordEntity);
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (String name : filedName) {
for (GenTableColumn gtc : Configs.medicalrecords) {
......@@ -142,6 +146,7 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
e.printStackTrace();
}
}
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
onNotifyAllEvent.setValue(false);
......@@ -296,9 +301,11 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
remarkParamEntity.setShowName("");
currentParamEntity = new GenTableColumn();
uuid = 0;
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.medicalrecords) {
gtc.setShowName("");
gtc.setContent("");
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/PerformanceVM.java
View file @ 17486fe8
......@@ -25,6 +25,7 @@ import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.entity.PerformanceEntity;
import com.phlx.anchorcollect_p.ui.fragment.list.CollectGridItem;
import com.phlx.anchorcollect_p.util.EntityUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import org.greenrobot.greendao.query.QueryBuilder;
......@@ -92,7 +93,9 @@ public class PerformanceVM extends BaseViewModel<Repository> {
+ "anchorCiq" + tag + ".jpg";
imgFile = new File(imgUrl);
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.performance) {
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
CollectGridItem cgi = new CollectGridItem(this, gtc, Configs.SIGN_MEASURE);
observableList.add(cgi);
}
......@@ -115,10 +118,9 @@ public class PerformanceVM extends BaseViewModel<Repository> {
remarkParamEntity.setContent(performanceEntity.getRemark());
String[] filedName = EntityUtils.getFiledName(performanceEntity);
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (String name : filedName) {
for (GenTableColumn gtc : Configs.performance) {
if (name.equals(gtc.getJavaField())) {
try {
Object fieldValueByName = EntityUtils.getFieldValueByName(name, performanceEntity);
......@@ -143,6 +145,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
e.printStackTrace();
}
}
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
onNotifyAllEvent.setValue(false);
......@@ -329,9 +332,11 @@ public class PerformanceVM extends BaseViewModel<Repository> {
remarkParamEntity.setShowName("");
currentParamEntity = new GenTableColumn();
uuid = 0;
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.performance) {
gtc.setShowName("");
gtc.setContent("");
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/WeightManVM.java
View file @ 17486fe8
......@@ -37,6 +37,7 @@ import com.phlx.anchorcollect_p.event.EventMsg;
import com.phlx.anchorcollect_p.event.EventTag;
import com.phlx.anchorcollect_p.ui.fragment.list.CollectGridItem;
import com.phlx.anchorcollect_p.util.EntityUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import com.phlx.anchorcollect_p.util.TextUtil;
import com.uhf.structures.InventoryData;
import com.uhf.structures.OnInventoryListener;
......@@ -158,7 +159,9 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
// imgFile = new File(imgUrl);
uiList.clear();
int i = 0;
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.weightMan) {
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
if (i < 4) {
uiList.add(gtc);
} else {
......@@ -477,10 +480,9 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
queryGainWeight();//刷新一下增重数据
String[] filedName = EntityUtils.getFiledName(result.get(0));
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (String name : filedName) {
for (GenTableColumn gtc : Configs.weightMan) {
if (name.equals(gtc.getJavaField())) {
try {
Log.e("key:", name);
......@@ -506,6 +508,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
e.printStackTrace();
}
}
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
}
......@@ -639,9 +642,11 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
remarkParamEntity.setContent("");
remarkParamEntity.setShowName("");
currentParamEntity = new GenTableColumn();
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (GenTableColumn gtc : Configs.weightMan) {
gtc.setShowName("");
gtc.setContent("");
LoginInfoUtils.setGenTableColumnDefault(gtc, dateFormat);
}
}
}
app/src/main/java/com/phlx/anchorcollect_p/util/LoginInfoUtils.java
View file @ 17486fe8
......@@ -4,10 +4,15 @@ package com.phlx.anchorcollect_p.util;
import com.phlx.anchorcollect_p.Configs;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.FrozenSemenEntity;
import com.phlx.anchorcollect_p.entity.GenTableColumn;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import me.goldze.mvvmhabit.utils.StringUtils;
public class LoginInfoUtils {
public static List<String> getDistNameList(String type){
......@@ -49,4 +54,27 @@ public class LoginInfoUtils {
return null;
}
/**
* 给单选设置默认值，给日期设置默认当天
* @param gtc
* @param dateFormat
*/
public static void setGenTableColumnDefault(GenTableColumn gtc, SimpleDateFormat dateFormat){
//增加单选默认值
if (StringUtils.isEmpty(gtc.getContent()) && (gtc.getHtmlType().equals("select") || gtc.getHtmlType().equals("radio"))) {
List<DictEntity> dictEntities = LoginInfoUtils.getDistList(gtc.getDictType());
for (int i = 0; i < dictEntities.size(); i++) {
if ("Y".equals(dictEntities.get(i).getIsDefault())) {
gtc.setContent(dictEntities.get(i).getDictValue());
gtc.setShowName(dictEntities.get(i).getDictLabel());
}
}
}
//增加时间默认值
if (StringUtils.isEmpty(gtc.getContent()) && gtc.getHtmlType().equals("datetime")) {
gtc.setContent(dateFormat.format(new Date()));
gtc.setShowName(dateFormat.format(new Date()));
}
}
}
app/src/main/res/layout/item_exchange_label.xml
View file @ 17486fe8
......@@ -23,7 +23,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_1_1_title"
style="@style/ItemTitleFontBlueStyle"
android:text="@string/registration_no"
android:text="@string/individual_no"
binding:layout_constraintTop_toTopOf="parent"
binding:layout_constraintStart_toStartOf="parent"
binding:layout_constraintBottom_toTopOf="@+id/tv_2_1_title"
......@@ -32,7 +32,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_1_1"
style="@style/ItemContentFontBlackStyle"
android:text="@{viewModel.entity.registrationNo}"
android:text="@{viewModel.entity.individualNo}"
binding:layout_constraintTop_toTopOf="@+id/tv_1_1_title"
binding:layout_constraintLeft_toRightOf="@+id/tv_1_1_title"
/>
......@@ -48,7 +48,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_2_1_title"
style="@style/ItemTitleFontBlueStyle"
android:text="@string/individual_no"
android:text="@string/registration_no"
android:layout_marginTop="@dimen/dp_10"
binding:layout_constraintStart_toStartOf="parent"
binding:layout_constraintTop_toBottomOf="@+id/tv_1_1_title" />
......@@ -56,7 +56,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_2_1"
style="@style/ItemContentFontBlackStyle"
android:text="@{viewModel.entity.individualNo}"
android:text="@{viewModel.entity.registrationNo}"
binding:layout_constraintTop_toTopOf="@+id/tv_2_1_title"
binding:layout_constraintLeft_toRightOf="@+id/tv_2_1_title"
/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment