Skip to content

A
AnchorCollect
Commit 53296ef1 authored by hywang's avatar hywang
Browse files
Options

1.修改entity的类型 

2.增加获取重量后扫rfid标签
3.同步页面，实现待上传数量、更新时间
4.pad的上电参数修改
parent a781e5e7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3724 additions and 3247 deletions
app/src/main/java/com/phlx/anchorcollect/Configs.java
View file @ 53296ef1
......@@ -13,6 +13,8 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import me.goldze.mvvmhabit.utils.SPUtils;
/**
* <pre>
......@@ -29,7 +31,7 @@ public class Configs {
/**
* 下载apk地址
*/
public static String downloadApk = "/app/download?type=2";
public static String downloadApk = "/app/download?type=APP";
/**
* 是否在线操作
......@@ -73,6 +75,17 @@ public class Configs {
public static final String BREEDING_RECORD = "breeding_record";
public static final String BREEDING_RECORD_DETAIL = "breeding_record_detail";
//最后更新的时间
public static final String SP_CATTLE_RESUME_UPDATE_DATE = "sp_cattle_resume_update_date";
public static final String SP_PERFORMANCE_UPDATE_DATE = "sp_performance_update_date";
public static final String SP_WEIGHT_MAN_UPDATE_DATE = "sp_weight_man_update_date";
public static final String SP_MEDICAL_RECORD_UPDATE_DATE = "sp_medical_record_update_date";
public static final String SP_IMMUNE_BATCH_UPDATE_DATE = "sp_immune_batch_update_date";
public static final String SP_IMMUNE_BATCH_DETAIL_UPDATE_DATE = "sp_immune_batch_detail_update_date";
public static final String SP_BREEDING_RECORD_UPDATE_DATE = "sp_breeding_record_update_date";
public static final String SP_BREEDING_RECORD_DETAIL_UPDATE_DATE = "sp_breeding_record_detail_update_date";
//0 高频，1低频
public static String FREQUENCY_CONFIG = "1";
......@@ -101,11 +114,13 @@ public class Configs {
//临时存放列表查询电子耳标
public static String tempRfid = "";
//临时存放列表查询unid
public static String tempUnid = "";
public static Long tempUnid;
//首页fragment标签
public static int mainPosition;
public static String resumeId;
public static Long resumeId;
public static String currentEvent;//控制接受重量数据的页面
// public static boolean ISCONNECTED;
......
app/src/main/java/com/phlx/anchorcollect/ble/BleDialog.java
View file @ 53296ef1
......@@ -80,7 +80,7 @@ public class BleDialog extends SupportActivity implements EventObserver {
case DISCONNECTED:
finish();
ToastUtils.show("蓝牙已断开");
EventUtils.post(new EventMsg(EventKey.KEY_BLUETOOTH_CONNECT_FAILED));
EventUtils.post(new EventMsg(EventKey.KEY_BLUETOOTH_CONNECT_FAILED, null));
break;
case SERVICE_DISCOVERED:
List<BluetoothGattService> services = bleManagers.getConnection().getGatt().getServices();
......
app/src/main/java/com/phlx/anchorcollect/ble/BleManagers.java
View file @ 53296ef1
......@@ -196,7 +196,7 @@ public class BleManagers {
if (!isServiceRunning(mContext)) {
mContext.startService(bleService);
} else {
EventUtils.post(new EventMsg(EventKey.KEY_BLUETOOTH_CONNECT_SUCCESS));
EventUtils.post(new EventMsg(EventKey.KEY_BLUETOOTH_CONNECT_SUCCESS,null));
}
}
......
app/src/main/java/com/phlx/anchorcollect/ble/BleService.java
View file @ 53296ef1
......@@ -50,7 +50,7 @@ public class BleService extends Service implements EventObserver {
public int onStartCommand(Intent intent, int flags, int startId) {
EasyBLE.getInstance().registerObserver(this);
bleManagers = BleManagers.from(this);
EventUtils.post(new EventMsg(EventKey.KEY_BLUETOOTH_CONNECT_SUCCESS));
EventUtils.post(new EventMsg(EventKey.KEY_BLUETOOTH_CONNECT_SUCCESS,null));
Log.e(TAG, "onStartCommand: "+"服务开启了" );
return START_STICKY;
......@@ -78,8 +78,8 @@ public class BleService extends Service implements EventObserver {
@Override
public void onConnectionStateChanged(@NonNull Device device) {
if (device.getConnectionState() == ConnectionState.DISCONNECTED) {
EventUtils.post(new EventMsg(EventKey.KEY_BLUETOOTH_CONNECT_FAILED));
EventUtils.post(new EventMsg<>(EventKey.KEY_INVENTORY_STOP));
EventUtils.post(new EventMsg(EventKey.KEY_BLUETOOTH_CONNECT_FAILED,null));
EventUtils.post(new EventMsg<>(EventKey.KEY_INVENTORY_STOP, null));
}
}
......
app/src/main/java/com/phlx/anchorcollect/bt/BtService.java
View file @ 53296ef1
......@@ -9,15 +9,18 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.phlx.anchorcollect.Configs;
import com.phlx.anchorcollect.ble.BleService;
import com.phlx.anchorcollect.event.EventKey;
import com.phlx.anchorcollect.event.EventMsg;
import com.phlx.anchorcollect.event.EventTag;
import com.phlx.anchorcollect.event.EventUtils;
import cn.wandersnail.bluetooth.BTManager;
import cn.wandersnail.bluetooth.ConnectCallback;
import cn.wandersnail.bluetooth.Connection;
import cn.wandersnail.bluetooth.EventObserver;
import me.goldze.mvvmhabit.bus.RxBus;
public class BtService extends Service implements EventObserver {
......@@ -44,11 +47,17 @@ public class BtService extends Service implements EventObserver {
@Override
public void onSuccess() {
Log.e(TAG, "connection.connect: " + "onSuccess");
EventMsg eventMsg = new EventMsg();
eventMsg.setAction(EventTag.EVENT_BT_SUCC);
RxBus.getDefault().post(eventMsg);
}
@Override
public void onFail(@NonNull String errMsg, @Nullable Throwable e) {
Log.e(TAG, "connection.connect: " + "onFail--" + errMsg);
EventMsg eventMsg = new EventMsg();
eventMsg.setAction(EventTag.EVENT_BT_FAIL);
RxBus.getDefault().post(eventMsg);
}
});
return START_STICKY;
......@@ -56,7 +65,15 @@ public class BtService extends Service implements EventObserver {
@Override
public void onRead(@NonNull BluetoothDevice device, @NonNull byte[] value) {
Log.e(TAG, "onRead: " + new String(value));
String data = new String(value);
Log.e(TAG, "onRead: " + data);
String weightData = data.substring(data.indexOf("wn") + 3, data.indexOf("kg") - 2);
EventMsg eventMsg = new EventMsg();
eventMsg.setAction(Configs.currentEvent);
eventMsg.setObj(weightData);
RxBus.getDefault().post(eventMsg);
}
@Override
......
app/src/main/java/com/phlx/anchorcollect/data/Repository.java
View file @ 53296ef1
......@@ -16,6 +16,7 @@ import com.phlx.anchorcollect.entity.LoginData;
import com.phlx.anchorcollect.entity.MedicalRecordEntity;
import com.phlx.anchorcollect.entity.PerformanceEntity;
import com.phlx.anchorcollect.entity.WeightManEntity;
import com.phlx.anchorcollect.params.BaseResponse;
import com.phlx.anchorcollect.params.CollectResponse;
import com.phlx.anchorcollect.params.ListResponse;
......@@ -56,6 +57,15 @@ public class Repository extends BaseModel implements HttpDataSource, LocalDataSo
INSTANCE = null;
}
@Override
public Observable<BaseResponse<Double>> versionGet() {
return mHttpDataSource.versionGet();
}
@Override
public Observable<BaseResponse> DownloadApp() {
return mHttpDataSource.DownloadApp();
}
@Override
public Observable<CollectResponse<LoginData>> loginPost(Map<String,String> map) {
......
app/src/main/java/com/phlx/anchorcollect/data/VMFactory.java
View file @ 53296ef1
......@@ -10,11 +10,10 @@ import androidx.lifecycle.ViewModelProvider;
import com.phlx.anchorcollect.ui.fragment.vm.BasicsCollectVM;
import com.phlx.anchorcollect.ui.fragment.vm.BreedingRecordVM;
import com.phlx.anchorcollect.ui.fragment.vm.CollectListVM;
import com.phlx.anchorcollect.ui.fragment.vm.CollectVM;
import com.phlx.anchorcollect.ui.fragment.vm.ImmunRecordVM;
import com.phlx.anchorcollect.ui.fragment.vm.MedicalRecordVM;
import com.phlx.anchorcollect.ui.fragment.vm.PerformanceVM;
import com.phlx.anchorcollect.ui.fragment.vm.WeightManVM;
import com.phlx.anchorcollect.ui.home.HomeVM;
import com.phlx.anchorcollect.ui.info.CattleVM;
import com.phlx.anchorcollect.ui.login.LoginVM;
......@@ -93,12 +92,11 @@ public class VMFactory extends ViewModelProvider.NewInstanceFactory {
} else if (modelClass.isAssignableFrom(BreedingRecordVM.class)) {
return (T) new BreedingRecordVM(mApplication, repository);
} else if (modelClass.isAssignableFrom(WeightManVM.class)) {
return (T) new WeightManVM(mApplication, repository);
} else if (modelClass.isAssignableFrom(CollectVM.class)) {
return (T) new CollectVM(mApplication, repository);
} else if (modelClass.isAssignableFrom(CollectListVM.class)) {
return (T) new CollectListVM(mApplication, repository);
} else if (modelClass.isAssignableFrom(CattleVM.class)) {
return (T) new CattleVM(mApplication, repository);
} else if (modelClass.isAssignableFrom(SettingVM.class)) {
......
app/src/main/java/com/phlx/anchorcollect/data/http/ApiService.java
View file @ 53296ef1
......@@ -12,6 +12,7 @@ import com.phlx.anchorcollect.entity.LoginData;
import com.phlx.anchorcollect.entity.MedicalRecordEntity;
import com.phlx.anchorcollect.entity.PerformanceEntity;
import com.phlx.anchorcollect.entity.WeightManEntity;
import com.phlx.anchorcollect.params.BaseResponse;
import com.phlx.anchorcollect.params.CollectResponse;
import com.phlx.anchorcollect.params.ListResponse;
......@@ -32,17 +33,17 @@ import retrofit2.http.POST;
public interface ApiService {
// /**
// * 获取版本号
// */
// @GET("/app/getAppVsesion?type=2")
// Observable<CattleResponse<Double>> versionGet();
//
// /**
// * 下载新版本
// */
// @GET("/app/download")
// Observable<CattleResponse> DownloadApp();
/**
* 获取版本号
*/
@GET("/app/getAppVsesion?type=APP")
Observable<BaseResponse<Double>> versionGet();
/**
* 下载新版本
*/
@GET("/app/download")
Observable<BaseResponse> DownloadApp();
// @Headers({"Content-Type: application/json", "Accept: application/json"})
......
app/src/main/java/com/phlx/anchorcollect/data/http/HttpDataSource.java
View file @ 53296ef1
......@@ -12,6 +12,7 @@ import com.phlx.anchorcollect.entity.LoginData;
import com.phlx.anchorcollect.entity.MedicalRecordEntity;
import com.phlx.anchorcollect.entity.PerformanceEntity;
import com.phlx.anchorcollect.entity.WeightManEntity;
import com.phlx.anchorcollect.params.BaseResponse;
import com.phlx.anchorcollect.params.CollectResponse;
import com.phlx.anchorcollect.params.ListResponse;
......@@ -32,15 +33,15 @@ public interface HttpDataSource {
// /**
// * 获取版本号
// */
// Observable<CattleResponse<Double>> versionGet();
//
// /**
// * 下载新版本
// */
// Observable<CattleResponse> DownloadApp();
/**
* 获取版本号
*/
Observable<BaseResponse<Double>> versionGet();
/**
* 下载新版本
*/
Observable<BaseResponse> DownloadApp();
/**
* 登录
......
app/src/main/java/com/phlx/anchorcollect/data/http/HttpDataSourceImpl.java
View file @ 53296ef1
......@@ -12,6 +12,7 @@ import com.phlx.anchorcollect.entity.LoginData;
import com.phlx.anchorcollect.entity.MedicalRecordEntity;
import com.phlx.anchorcollect.entity.PerformanceEntity;
import com.phlx.anchorcollect.entity.WeightManEntity;
import com.phlx.anchorcollect.params.BaseResponse;
import com.phlx.anchorcollect.params.CollectResponse;
import com.phlx.anchorcollect.params.ListResponse;
......@@ -48,6 +49,15 @@ public class HttpDataSourceImpl implements HttpDataSource {
this.apiService = apiService;
}
@Override
public Observable<BaseResponse<Double>> versionGet() {
return apiService.versionGet();
}
@Override
public Observable<BaseResponse> DownloadApp() {
return apiService.DownloadApp();
}
@Override
public Observable<CollectResponse<LoginData>> loginPost(@FieldMap Map<String, String> map) {
......
app/src/main/java/com/phlx/anchorcollect/db/MyOpenHelper.java
View file @ 53296ef1
......@@ -4,8 +4,16 @@ import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import com.github.yuweiguocn.library.greendao.MigrationHelper;
import com.phlx.anchorcollect.db.gen.CardEntityDao;
import com.phlx.anchorcollect.db.gen.BreedingRecordDetailEntityDao;
import com.phlx.anchorcollect.db.gen.BreedingRecordEntityDao;
import com.phlx.anchorcollect.db.gen.CattleResumeEntityDao;
import com.phlx.anchorcollect.db.gen.DaoMaster;
import com.phlx.anchorcollect.db.gen.DictEntityDao;
import com.phlx.anchorcollect.db.gen.ImmuneBatchDetailEntityDao;
import com.phlx.anchorcollect.db.gen.ImmuneBatchEntityDao;
import com.phlx.anchorcollect.db.gen.MedicalRecordEntityDao;
import com.phlx.anchorcollect.db.gen.PerformanceEntityDao;
import com.phlx.anchorcollect.db.gen.WeightManEntityDao;
import org.greenrobot.greendao.database.Database;
......@@ -28,7 +36,16 @@ public class MyOpenHelper extends DaoMaster.DevOpenHelper {
DaoMaster.dropAllTables(db, ifExists);
}
},
CardEntityDao.class
CattleResumeEntityDao.class,
PerformanceEntityDao.class,
WeightManEntityDao.class,
MedicalRecordEntityDao.class,
ImmuneBatchEntityDao.class,
ImmuneBatchDetailEntityDao.class,
BreedingRecordEntityDao.class,
BreedingRecordDetailEntityDao.class,
DictEntityDao.class
// CardEntityDao.class
// DivisionEntityDao.class, HarmlessDao.class, HarmlessDetailDao.class, LabelDao.class
// , MarkingDao.class, QuarantineDao.class, QuarantineDetailDao.class
// , TreatmentMethodDao.class, UnitDao.class, VarietyDao.class, VeterinaryDao.class
......
app/src/main/java/com/phlx/anchorcollect/db/gen/DaoMaster.java
View file @ 53296ef1
......@@ -24,7 +24,6 @@ public class DaoMaster extends AbstractDaoMaster {
AncestryinfoEntityDao.createTable(db, ifNotExists);
BreedingRecordDetailEntityDao.createTable(db, ifNotExists);
BreedingRecordEntityDao.createTable(db, ifNotExists);
CardEntityDao.createTable(db, ifNotExists);
CattleResumeEntityDao.createTable(db, ifNotExists);
DictEntityDao.createTable(db, ifNotExists);
GenTableDao.createTable(db, ifNotExists);
......@@ -42,7 +41,6 @@ public class DaoMaster extends AbstractDaoMaster {
AncestryinfoEntityDao.dropTable(db, ifExists);
BreedingRecordDetailEntityDao.dropTable(db, ifExists);
BreedingRecordEntityDao.dropTable(db, ifExists);
CardEntityDao.dropTable(db, ifExists);
CattleResumeEntityDao.dropTable(db, ifExists);
DictEntityDao.dropTable(db, ifExists);
GenTableDao.dropTable(db, ifExists);
......@@ -74,7 +72,6 @@ public class DaoMaster extends AbstractDaoMaster {
registerDaoClass(AncestryinfoEntityDao.class);
registerDaoClass(BreedingRecordDetailEntityDao.class);
registerDaoClass(BreedingRecordEntityDao.class);
registerDaoClass(CardEntityDao.class);
registerDaoClass(CattleResumeEntityDao.class);
registerDaoClass(DictEntityDao.class);
registerDaoClass(GenTableDao.class);
......
app/src/main/java/com/phlx/anchorcollect/db/gen/DaoSession.java
View file @ 53296ef1
......@@ -11,7 +11,6 @@ import org.greenrobot.greendao.internal.DaoConfig;
import com.phlx.anchorcollect.entity.AncestryinfoEntity;
import com.phlx.anchorcollect.entity.BreedingRecordDetailEntity;
import com.phlx.anchorcollect.entity.BreedingRecordEntity;
import com.phlx.anchorcollect.entity.CardEntity;
import com.phlx.anchorcollect.entity.CattleResumeEntity;
import com.phlx.anchorcollect.entity.DictEntity;
import com.phlx.anchorcollect.entity.GenTable;
......@@ -26,7 +25,6 @@ import com.phlx.anchorcollect.entity.WeightManEntity;
import com.phlx.anchorcollect.db.gen.AncestryinfoEntityDao;
import com.phlx.anchorcollect.db.gen.BreedingRecordDetailEntityDao;
import com.phlx.anchorcollect.db.gen.BreedingRecordEntityDao;
import com.phlx.anchorcollect.db.gen.CardEntityDao;
import com.phlx.anchorcollect.db.gen.CattleResumeEntityDao;
import com.phlx.anchorcollect.db.gen.DictEntityDao;
import com.phlx.anchorcollect.db.gen.GenTableDao;
......@@ -50,7 +48,6 @@ public class DaoSession extends AbstractDaoSession {
private final DaoConfig ancestryinfoEntityDaoConfig;
private final DaoConfig breedingRecordDetailEntityDaoConfig;
private final DaoConfig breedingRecordEntityDaoConfig;
private final DaoConfig cardEntityDaoConfig;
private final DaoConfig cattleResumeEntityDaoConfig;
private final DaoConfig dictEntityDaoConfig;
private final DaoConfig genTableDaoConfig;
......@@ -65,7 +62,6 @@ public class DaoSession extends AbstractDaoSession {
private final AncestryinfoEntityDao ancestryinfoEntityDao;
private final BreedingRecordDetailEntityDao breedingRecordDetailEntityDao;
private final BreedingRecordEntityDao breedingRecordEntityDao;
private final CardEntityDao cardEntityDao;
private final CattleResumeEntityDao cattleResumeEntityDao;
private final DictEntityDao dictEntityDao;
private final GenTableDao genTableDao;
......@@ -90,9 +86,6 @@ public class DaoSession extends AbstractDaoSession {
breedingRecordEntityDaoConfig = daoConfigMap.get(BreedingRecordEntityDao.class).clone();
breedingRecordEntityDaoConfig.initIdentityScope(type);
cardEntityDaoConfig = daoConfigMap.get(CardEntityDao.class).clone();
cardEntityDaoConfig.initIdentityScope(type);
cattleResumeEntityDaoConfig = daoConfigMap.get(CattleResumeEntityDao.class).clone();
cattleResumeEntityDaoConfig.initIdentityScope(type);
......@@ -126,7 +119,6 @@ public class DaoSession extends AbstractDaoSession {
ancestryinfoEntityDao = new AncestryinfoEntityDao(ancestryinfoEntityDaoConfig, this);
breedingRecordDetailEntityDao = new BreedingRecordDetailEntityDao(breedingRecordDetailEntityDaoConfig, this);
breedingRecordEntityDao = new BreedingRecordEntityDao(breedingRecordEntityDaoConfig, this);
cardEntityDao = new CardEntityDao(cardEntityDaoConfig, this);
cattleResumeEntityDao = new CattleResumeEntityDao(cattleResumeEntityDaoConfig, this);
dictEntityDao = new DictEntityDao(dictEntityDaoConfig, this);
genTableDao = new GenTableDao(genTableDaoConfig, this);
......@@ -141,7 +133,6 @@ public class DaoSession extends AbstractDaoSession {
registerDao(AncestryinfoEntity.class, ancestryinfoEntityDao);
registerDao(BreedingRecordDetailEntity.class, breedingRecordDetailEntityDao);
registerDao(BreedingRecordEntity.class, breedingRecordEntityDao);
registerDao(CardEntity.class, cardEntityDao);
registerDao(CattleResumeEntity.class, cattleResumeEntityDao);
registerDao(DictEntity.class, dictEntityDao);
registerDao(GenTable.class, genTableDao);
......@@ -158,7 +149,6 @@ public class DaoSession extends AbstractDaoSession {
ancestryinfoEntityDaoConfig.clearIdentityScope();
breedingRecordDetailEntityDaoConfig.clearIdentityScope();
breedingRecordEntityDaoConfig.clearIdentityScope();
cardEntityDaoConfig.clearIdentityScope();
cattleResumeEntityDaoConfig.clearIdentityScope();
dictEntityDaoConfig.clearIdentityScope();
genTableDaoConfig.clearIdentityScope();
......@@ -183,10 +173,6 @@ public class DaoSession extends AbstractDaoSession {
return breedingRecordEntityDao;
}
public CardEntityDao getCardEntityDao() {
return cardEntityDao;
}
public CattleResumeEntityDao getCattleResumeEntityDao() {
return cattleResumeEntityDao;
}
......
app/src/main/java/com/phlx/anchorcollect/entity/BreedingRecordDetailEntity.java
View file @ 53296ef1
......@@ -24,12 +24,12 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
* unid
*/
@Id(autoincrement = false)
private String unid;
private Long unid;
/**
* 主表ID
*/
private String fUnid;
private Long fUnid;
/**
* 配种方式;（本交，受精）
......@@ -39,7 +39,7 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
/**
* 种畜耳标号
*/
private String cattleresumeId;
private Long cattleresumeId;
/**
* 冻精批次号
......@@ -69,12 +69,12 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
/**
* 配种成功
*/
private String pregnancy;
private Integer pregnancy;
/**
* 部门id
*/
private String deptId;
private Long deptId;
/** 是否上传 0未上传，1已上传 */
private String uploadStatus;
......@@ -102,17 +102,37 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
}
protected BreedingRecordDetailEntity(Parcel in) {
unid = in.readString();
fUnid = in.readString();
if (in.readByte() == 0) {
unid = null;
} else {
unid = in.readLong();
}
if (in.readByte() == 0) {
fUnid = null;
} else {
fUnid = in.readLong();
}
matingStyle = in.readString();
cattleresumeId = in.readString();
if (in.readByte() == 0) {
cattleresumeId = null;
} else {
cattleresumeId = in.readLong();
}
frozenSemenBatch = in.readString();
matingDate = in.readString();
isReturn = in.readString();
backLoveDate = in.readString();
dueDate = in.readString();
pregnancy = in.readString();
deptId = in.readString();
if (in.readByte() == 0) {
pregnancy = null;
} else {
pregnancy = in.readInt();
}
if (in.readByte() == 0) {
deptId = null;
} else {
deptId = in.readLong();
}
uploadStatus = in.readString();
searchValue = in.readString();
createBy = in.readString();
......@@ -122,10 +142,10 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
remark = in.readString();
}
@Generated(hash = 2062840275)
public BreedingRecordDetailEntity(String unid, String fUnid, String matingStyle, String cattleresumeId,
@Generated(hash = 1374135081)
public BreedingRecordDetailEntity(Long unid, Long fUnid, String matingStyle, Long cattleresumeId,
String frozenSemenBatch, String matingDate, String isReturn, String backLoveDate, String dueDate,
String pregnancy, String deptId, String uploadStatus, String searchValue, String createBy,
Integer pregnancy, Long deptId, String uploadStatus, String searchValue, String createBy,
String createTime, String updateBy, String updateTime, String remark) {
this.unid = unid;
this.fUnid = fUnid;
......@@ -149,17 +169,42 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(unid);
dest.writeString(fUnid);
if (unid == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(unid);
}
if (fUnid == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(fUnid);
}
dest.writeString(matingStyle);
dest.writeString(cattleresumeId);
if (cattleresumeId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(cattleresumeId);
}
dest.writeString(frozenSemenBatch);
dest.writeString(matingDate);
dest.writeString(isReturn);
dest.writeString(backLoveDate);
dest.writeString(dueDate);
dest.writeString(pregnancy);
dest.writeString(deptId);
if (pregnancy == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeInt(pregnancy);
}
if (deptId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(deptId);
}
dest.writeString(uploadStatus);
dest.writeString(searchValue);
dest.writeString(createBy);
......@@ -186,19 +231,19 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
}
};
public String getUnid() {
public Long getUnid() {
return unid;
}
public void setUnid(String unid) {
public void setUnid(Long unid) {
this.unid = unid;
}
public String getfUnid() {
public Long getfUnid() {
return fUnid;
}
public void setfUnid(String fUnid) {
public void setfUnid(Long fUnid) {
this.fUnid = fUnid;
}
......@@ -210,11 +255,11 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
this.matingStyle = matingStyle;
}
public String getCattleresumeId() {
public Long getCattleresumeId() {
return cattleresumeId;
}
public void setCattleresumeId(String cattleresumeId) {
public void setCattleresumeId(Long cattleresumeId) {
this.cattleresumeId = cattleresumeId;
}
......@@ -258,19 +303,19 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
this.dueDate = dueDate;
}
public String getPregnancy() {
public Integer getPregnancy() {
return pregnancy;
}
public void setPregnancy(String pregnancy) {
public void setPregnancy(Integer pregnancy) {
this.pregnancy = pregnancy;
}
public String getDeptId() {
public Long getDeptId() {
return deptId;
}
public void setDeptId(String deptId) {
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
......@@ -354,11 +399,12 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
'}';
}
public String getFUnid() {
public Long getFUnid() {
return this.fUnid;
}
public void setFUnid(String fUnid) {
public void setFUnid(Long fUnid) {
this.fUnid = fUnid;
}
}
app/src/main/java/com/phlx/anchorcollect/entity/BreedingRecordEntity.java
View file @ 53296ef1
......@@ -24,12 +24,12 @@ public class BreedingRecordEntity extends BaseObservable implements Parcelable {
* unid
*/
@Id(autoincrement = false)
private String unid;
private Long unid;
/**
* 母畜耳标号
*/
private String cattleresumeId;
private Long cattleresumeId;
/**
* 饲养品种（利木赞;西门塔尔等）
......@@ -52,7 +52,7 @@ public class BreedingRecordEntity extends BaseObservable implements Parcelable {
/**
* 部门id
*/
private String deptId;
private Long deptId;
/** 搜索值 */
private String searchValue;
......@@ -76,13 +76,25 @@ public class BreedingRecordEntity extends BaseObservable implements Parcelable {
}
protected BreedingRecordEntity(Parcel in) {
unid = in.readString();
cattleresumeId = in.readString();
if (in.readByte() == 0) {
unid = null;
} else {
unid = in.readLong();
}
if (in.readByte() == 0) {
cattleresumeId = null;
} else {
cattleresumeId = in.readLong();
}
raiseVarieties = in.readString();
location = in.readString();
breedingPlantId = in.readString();
uploadStatus = in.readString();
deptId = in.readString();
if (in.readByte() == 0) {
deptId = null;
} else {
deptId = in.readLong();
}
searchValue = in.readString();
createBy = in.readString();
createTime = in.readString();
......@@ -91,11 +103,10 @@ public class BreedingRecordEntity extends BaseObservable implements Parcelable {
remark = in.readString();
}
@Generated(hash = 1293154819)
public BreedingRecordEntity(String unid, String cattleresumeId, String raiseVarieties,
String location, String breedingPlantId, String uploadStatus, String deptId,
String searchValue, String createBy, String createTime, String updateBy, String updateTime,
String remark) {
@Generated(hash = 879600834)
public BreedingRecordEntity(Long unid, Long cattleresumeId, String raiseVarieties, String location,
String breedingPlantId, String uploadStatus, Long deptId, String searchValue,
String createBy, String createTime, String updateBy, String updateTime, String remark) {
this.unid = unid;
this.cattleresumeId = cattleresumeId;
this.raiseVarieties = raiseVarieties;
......@@ -113,13 +124,28 @@ public class BreedingRecordEntity extends BaseObservable implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(unid);
dest.writeString(cattleresumeId);
if (unid == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(unid);
}
if (cattleresumeId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(cattleresumeId);
}
dest.writeString(raiseVarieties);
dest.writeString(location);
dest.writeString(breedingPlantId);
dest.writeString(uploadStatus);
dest.writeString(deptId);
if (deptId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(deptId);
}
dest.writeString(searchValue);
dest.writeString(createBy);
dest.writeString(createTime);
......@@ -145,19 +171,19 @@ public class BreedingRecordEntity extends BaseObservable implements Parcelable {
}
};
public String getUnid() {
public Long getUnid() {
return unid;
}
public void setUnid(String unid) {
public void setUnid(Long unid) {
this.unid = unid;
}
public String getCattleresumeId() {
public Long getCattleresumeId() {
return cattleresumeId;
}
public void setCattleresumeId(String cattleresumeId) {
public void setCattleresumeId(Long cattleresumeId) {
this.cattleresumeId = cattleresumeId;
}
......@@ -193,11 +219,11 @@ public class BreedingRecordEntity extends BaseObservable implements Parcelable {
this.uploadStatus = uploadStatus;
}
public String getDeptId() {
public Long getDeptId() {
return deptId;
}
public void setDeptId(String deptId) {
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
......
app/src/main/java/com/phlx/anchorcollect/entity/CattleResumeEntity.java
View file @ 53296ef1
......@@ -22,7 +22,7 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
/** unid主键 */
@Id(autoincrement = false)
private String unid;
private Long unid;
/** 电子耳标 */
private String registrationNo;
......@@ -43,7 +43,7 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
private String birthdate;
/** 出生重量 */
private String birthHeavy;
private Double birthHeavy;
/** 性别 */
private String sex;
......@@ -67,7 +67,7 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
private String motherReg;
/** 离乳重 */
private String fromMilkHeavy;
private Double fromMilkHeavy;
/** 健康状态 */
private String health;
......@@ -85,13 +85,13 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
private String status;
/** 是否淘汰;0,在用，1淘汰 */
private String isOut;
private Long isOut;
/** 时间戳 */
private String inputTime;
/** 部门id */
private String deptId;
private Long deptId;
/** 是否上传 0未上传，1已上传 */
private String uploadStatus;
......@@ -119,14 +119,22 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
}
protected CattleResumeEntity(Parcel in) {
unid = in.readString();
if (in.readByte() == 0) {
unid = null;
} else {
unid = in.readLong();
}
registrationNo = in.readString();
individualNo = in.readString();
circleNo = in.readString();
raiseType = in.readString();
raiseVarieties = in.readString();
birthdate = in.readString();
birthHeavy = in.readString();
if (in.readByte() == 0) {
birthHeavy = null;
} else {
birthHeavy = in.readDouble();
}
sex = in.readString();
birthDifficulty = in.readString();
isTwins = in.readString();
......@@ -134,15 +142,27 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
grade = in.readString();
fatherReg = in.readString();
motherReg = in.readString();
fromMilkHeavy = in.readString();
if (in.readByte() == 0) {
fromMilkHeavy = null;
} else {
fromMilkHeavy = in.readDouble();
}
health = in.readString();
junHeavy = in.readString();
decAppScore = in.readString();
photo = in.readString();
status = in.readString();
isOut = in.readString();
if (in.readByte() == 0) {
isOut = null;
} else {
isOut = in.readLong();
}
inputTime = in.readString();
deptId = in.readString();
if (in.readByte() == 0) {
deptId = null;
} else {
deptId = in.readLong();
}
uploadStatus = in.readString();
uploadTime = in.readString();
createBy = in.readString();
......@@ -152,14 +172,14 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
remark = in.readString();
}
@Generated(hash = 1823167200)
public CattleResumeEntity(String unid, String registrationNo, String individualNo, String circleNo,
String raiseType, String raiseVarieties, String birthdate, String birthHeavy, String sex,
@Generated(hash = 2055075095)
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, String fromMilkHeavy, String health, String junHeavy, String decAppScore,
String photo, String status, String isOut, String inputTime, String deptId,
String uploadStatus, String uploadTime, String createBy, String createTime, String updateBy,
String updateTime, String remark) {
String motherReg, Double fromMilkHeavy, String health, String junHeavy, String decAppScore,
String photo, String status, Long isOut, 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;
......@@ -195,14 +215,24 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(unid);
if (unid == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(unid);
}
dest.writeString(registrationNo);
dest.writeString(individualNo);
dest.writeString(circleNo);
dest.writeString(raiseType);
dest.writeString(raiseVarieties);
dest.writeString(birthdate);
dest.writeString(birthHeavy);
if (birthHeavy == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeDouble(birthHeavy);
}
dest.writeString(sex);
dest.writeString(birthDifficulty);
dest.writeString(isTwins);
......@@ -210,15 +240,30 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
dest.writeString(grade);
dest.writeString(fatherReg);
dest.writeString(motherReg);
dest.writeString(fromMilkHeavy);
if (fromMilkHeavy == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeDouble(fromMilkHeavy);
}
dest.writeString(health);
dest.writeString(junHeavy);
dest.writeString(decAppScore);
dest.writeString(photo);
dest.writeString(status);
dest.writeString(isOut);
if (isOut == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(isOut);
}
dest.writeString(inputTime);
dest.writeString(deptId);
if (deptId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(deptId);
}
dest.writeString(uploadStatus);
dest.writeString(uploadTime);
dest.writeString(createBy);
......@@ -245,11 +290,15 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
}
};
public String getUnid() {
public static long getSerialVersionUID() {
return serialVersionUID;
}
public Long getUnid() {
return unid;
}
public void setUnid(String unid) {
public void setUnid(Long unid) {
this.unid = unid;
}
......@@ -301,11 +350,11 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this.birthdate = birthdate;
}
public String getBirthHeavy() {
public Double getBirthHeavy() {
return birthHeavy;
}
public void setBirthHeavy(String birthHeavy) {
public void setBirthHeavy(Double birthHeavy) {
this.birthHeavy = birthHeavy;
}
......@@ -365,11 +414,11 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this.motherReg = motherReg;
}
public String getFromMilkHeavy() {
public Double getFromMilkHeavy() {
return fromMilkHeavy;
}
public void setFromMilkHeavy(String fromMilkHeavy) {
public void setFromMilkHeavy(Double fromMilkHeavy) {
this.fromMilkHeavy = fromMilkHeavy;
}
......@@ -413,11 +462,11 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this.status = status;
}
public String getIsOut() {
public Long getIsOut() {
return isOut;
}
public void setIsOut(String isOut) {
public void setIsOut(Long isOut) {
this.isOut = isOut;
}
......@@ -429,11 +478,11 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this.inputTime = inputTime;
}
public String getDeptId() {
public Long getDeptId() {
return deptId;
}
public void setDeptId(String deptId) {
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
......
app/src/main/java/com/phlx/anchorcollect/entity/ImmuneBatchDetailEntity.java
View file @ 53296ef1
......@@ -23,22 +23,22 @@ public class ImmuneBatchDetailEntity extends BaseObservable implements Parcelabl
* unid
*/
@Id(autoincrement = false)
private String unid;
private Long unid;
/**
* 基础信息unid
*/
private String cattleresumeUnid;
private Long cattleresumeUnid;
/**
* 免疫记录unid
*/
private String immunebatchUnid;
private Long immunebatchUnid;
/**
* 部门id
*/
private String deptId;
private Long deptId;
/** 是否上传 0未上传，1已上传 */
......@@ -48,15 +48,31 @@ public class ImmuneBatchDetailEntity extends BaseObservable implements Parcelabl
}
protected ImmuneBatchDetailEntity(Parcel in) {
unid = in.readString();
cattleresumeUnid = in.readString();
immunebatchUnid = in.readString();
deptId = in.readString();
if (in.readByte() == 0) {
unid = null;
} else {
unid = in.readLong();
}
if (in.readByte() == 0) {
cattleresumeUnid = null;
} else {
cattleresumeUnid = in.readLong();
}
if (in.readByte() == 0) {
immunebatchUnid = null;
} else {
immunebatchUnid = in.readLong();
}
if (in.readByte() == 0) {
deptId = null;
} else {
deptId = in.readLong();
}
uploadStatus = in.readString();
}
@Generated(hash = 1625164961)
public ImmuneBatchDetailEntity(String unid, String cattleresumeUnid, String immunebatchUnid, String deptId,
@Generated(hash = 1563550765)
public ImmuneBatchDetailEntity(Long unid, Long cattleresumeUnid, Long immunebatchUnid, Long deptId,
String uploadStatus) {
this.unid = unid;
this.cattleresumeUnid = cattleresumeUnid;
......@@ -67,10 +83,30 @@ public class ImmuneBatchDetailEntity extends BaseObservable implements Parcelabl
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(unid);
dest.writeString(cattleresumeUnid);
dest.writeString(immunebatchUnid);
dest.writeString(deptId);
if (unid == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(unid);
}
if (cattleresumeUnid == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(cattleresumeUnid);
}
if (immunebatchUnid == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(immunebatchUnid);
}
if (deptId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(deptId);
}
dest.writeString(uploadStatus);
}
......@@ -91,35 +127,35 @@ public class ImmuneBatchDetailEntity extends BaseObservable implements Parcelabl
}
};
public String getUnid() {
public Long getUnid() {
return unid;
}
public void setUnid(String unid) {
public void setUnid(Long unid) {
this.unid = unid;
}
public String getCattleresumeUnid() {
public Long getCattleresumeUnid() {
return cattleresumeUnid;
}
public void setCattleresumeUnid(String cattleresumeUnid) {
public void setCattleresumeUnid(Long cattleresumeUnid) {
this.cattleresumeUnid = cattleresumeUnid;
}
public String getImmunebatchUnid() {
public Long getImmunebatchUnid() {
return immunebatchUnid;
}
public void setImmunebatchUnid(String immunebatchUnid) {
public void setImmunebatchUnid(Long immunebatchUnid) {
this.immunebatchUnid = immunebatchUnid;
}
public String getDeptId() {
public Long getDeptId() {
return deptId;
}
public void setDeptId(String deptId) {
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
......
app/src/main/java/com/phlx/anchorcollect/entity/ImmuneBatchEntity.java
View file @ 53296ef1
......@@ -25,7 +25,7 @@ public class ImmuneBatchEntity extends BaseObservable implements Parcelable {
* 主键
*/
@Id(autoincrement = false)
private String unid;
private Long unid;
/**
* 圈舍号
......@@ -89,7 +89,7 @@ public class ImmuneBatchEntity extends BaseObservable implements Parcelable {
/**
* 部门id
*/
private String deptId;
private Long deptId;
/** 搜索值 */
private String searchValue;
......@@ -113,7 +113,11 @@ public class ImmuneBatchEntity extends BaseObservable implements Parcelable {
}
protected ImmuneBatchEntity(Parcel in) {
unid = in.readString();
if (in.readByte() == 0) {
unid = null;
} else {
unid = in.readLong();
}
circleNo = in.readString();
immuneExp = in.readString();
immuneDate = in.readString();
......@@ -126,7 +130,11 @@ public class ImmuneBatchEntity extends BaseObservable implements Parcelable {
immuneDosage = in.readString();
immuneMethod = in.readString();
uploadStatus = in.readString();
deptId = in.readString();
if (in.readByte() == 0) {
deptId = null;
} else {
deptId = in.readLong();
}
searchValue = in.readString();
createBy = in.readString();
createTime = in.readString();
......@@ -135,11 +143,11 @@ public class ImmuneBatchEntity extends BaseObservable implements Parcelable {
remark = in.readString();
}
@Generated(hash = 520368057)
public ImmuneBatchEntity(String unid, String circleNo, String immuneExp, String immuneDate,
@Generated(hash = 565285682)
public ImmuneBatchEntity(Long unid, String circleNo, String immuneExp, String immuneDate,
String immunePerson, String perinatalPeriod, String vaccineName, String lotnumber,
String manufacturer, String specifications, String immuneDosage, String immuneMethod,
String uploadStatus, String deptId, String searchValue, String createBy, String createTime,
String uploadStatus, Long deptId, String searchValue, String createBy, String createTime,
String updateBy, String updateTime, String remark) {
this.unid = unid;
this.circleNo = circleNo;
......@@ -165,7 +173,12 @@ public class ImmuneBatchEntity extends BaseObservable implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(unid);
if (unid == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(unid);
}
dest.writeString(circleNo);
dest.writeString(immuneExp);
dest.writeString(immuneDate);
......@@ -178,7 +191,12 @@ public class ImmuneBatchEntity extends BaseObservable implements Parcelable {
dest.writeString(immuneDosage);
dest.writeString(immuneMethod);
dest.writeString(uploadStatus);
dest.writeString(deptId);
if (deptId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(deptId);
}
dest.writeString(searchValue);
dest.writeString(createBy);
dest.writeString(createTime);
......@@ -204,11 +222,11 @@ public class ImmuneBatchEntity extends BaseObservable implements Parcelable {
}
};
public String getUnid() {
public Long getUnid() {
return unid;
}
public void setUnid(String unid) {
public void setUnid(Long unid) {
this.unid = unid;
}
......@@ -308,11 +326,11 @@ public class ImmuneBatchEntity extends BaseObservable implements Parcelable {
this.uploadStatus = uploadStatus;
}
public String getDeptId() {
public Long getDeptId() {
return deptId;
}
public void setDeptId(String deptId) {
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
......
app/src/main/java/com/phlx/anchorcollect/entity/MedicalRecordEntity.java
View file @ 53296ef1
......@@ -25,12 +25,12 @@ public class MedicalRecordEntity extends BaseObservable implements Parcelable {
* 自增列
*/
@Id(autoincrement = false)
private String unid;
private Long unid;
/**
* 基本信息ID
*/
private String cattleresumeId;
private Long cattleresumeId;
/**
* 诊疗日期
......@@ -65,7 +65,7 @@ public class MedicalRecordEntity extends BaseObservable implements Parcelable {
/**
* 用药数量
*/
private String drugNumber;
private Double drugNumber;
/**
* 诊疗结果
......@@ -78,7 +78,7 @@ public class MedicalRecordEntity extends BaseObservable implements Parcelable {
/**
* 部门id
*/
private String deptId;
private Long deptId;
/** 搜索值 */
private String searchValue;
......@@ -102,18 +102,34 @@ public class MedicalRecordEntity extends BaseObservable implements Parcelable {
}
protected MedicalRecordEntity(Parcel in) {
unid = in.readString();
cattleresumeId = in.readString();
if (in.readByte() == 0) {
unid = null;
} else {
unid = in.readLong();
}
if (in.readByte() == 0) {
cattleresumeId = null;
} else {
cattleresumeId = in.readLong();
}
treatDate = in.readString();
treatPersonnel = in.readString();
causeOf = in.readString();
drugName = in.readString();
specifications = in.readString();
drugMethods = in.readString();
drugNumber = in.readString();
if (in.readByte() == 0) {
drugNumber = null;
} else {
drugNumber = in.readDouble();
}
results = in.readString();
uploadStatus = in.readString();
deptId = in.readString();
if (in.readByte() == 0) {
deptId = null;
} else {
deptId = in.readLong();
}
searchValue = in.readString();
createBy = in.readString();
createTime = in.readString();
......@@ -122,12 +138,11 @@ public class MedicalRecordEntity extends BaseObservable implements Parcelable {
remark = in.readString();
}
@Generated(hash = 1678677230)
public MedicalRecordEntity(String unid, String cattleresumeId, String treatDate,
String treatPersonnel, String causeOf, String drugName, String specifications,
String drugMethods, String drugNumber, String results, String uploadStatus, String deptId,
String searchValue, String createBy, String createTime, String updateBy, String updateTime,
String remark) {
@Generated(hash = 119879249)
public MedicalRecordEntity(Long unid, Long cattleresumeId, String treatDate, String treatPersonnel,
String causeOf, String drugName, String specifications, String drugMethods,
Double drugNumber, String results, String uploadStatus, Long deptId, String searchValue,
String createBy, String createTime, String updateBy, String updateTime, String remark) {
this.unid = unid;
this.cattleresumeId = cattleresumeId;
this.treatDate = treatDate;
......@@ -150,18 +165,38 @@ public class MedicalRecordEntity extends BaseObservable implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(unid);
dest.writeString(cattleresumeId);
if (unid == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(unid);
}
if (cattleresumeId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(cattleresumeId);
}
dest.writeString(treatDate);
dest.writeString(treatPersonnel);
dest.writeString(causeOf);
dest.writeString(drugName);
dest.writeString(specifications);
dest.writeString(drugMethods);
dest.writeString(drugNumber);
if (drugNumber == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeDouble(drugNumber);
}
dest.writeString(results);
dest.writeString(uploadStatus);
dest.writeString(deptId);
if (deptId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(deptId);
}
dest.writeString(searchValue);
dest.writeString(createBy);
dest.writeString(createTime);
......@@ -187,19 +222,19 @@ public class MedicalRecordEntity extends BaseObservable implements Parcelable {
}
};
public String getUnid() {
public Long getUnid() {
return unid;
}
public void setUnid(String unid) {
public void setUnid(Long unid) {
this.unid = unid;
}
public String getCattleresumeId() {
public Long getCattleresumeId() {
return cattleresumeId;
}
public void setCattleresumeId(String cattleresumeId) {
public void setCattleresumeId(Long cattleresumeId) {
this.cattleresumeId = cattleresumeId;
}
......@@ -251,11 +286,11 @@ public class MedicalRecordEntity extends BaseObservable implements Parcelable {
this.drugMethods = drugMethods;
}
public String getDrugNumber() {
public Double getDrugNumber() {
return drugNumber;
}
public void setDrugNumber(String drugNumber) {
public void setDrugNumber(Double drugNumber) {
this.drugNumber = drugNumber;
}
......@@ -275,11 +310,11 @@ public class MedicalRecordEntity extends BaseObservable implements Parcelable {
this.uploadStatus = uploadStatus;
}
public String getDeptId() {
public Long getDeptId() {
return deptId;
}
public void setDeptId(String deptId) {
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
......
app/src/main/java/com/phlx/anchorcollect/entity/WeightManEntity.java
View file @ 53296ef1
......@@ -7,6 +7,7 @@ import androidx.databinding.BaseObservable;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Generated;
import org.greenrobot.greendao.annotation.Id;
/**
* 称重管理类
......@@ -17,17 +18,21 @@ public class WeightManEntity extends BaseObservable implements Parcelable {
/**
* unid
*/
private String unid;
@Id(autoincrement = false)
private Long unid;
/**
* 基本信息ID
*/
private String cattleresumeId;
private Long cattleresumeId;
/**
* 体重
*/
private String weight;
private Double weight;
/** 称重日期 */
private String wTime;
/** 是否上传 0未上传，1已上传 */
private String uploadStatus;
......@@ -35,7 +40,7 @@ public class WeightManEntity extends BaseObservable implements Parcelable {
/**
* 部门id
*/
private String deptId;
private Long deptId;
/** 搜索值 */
private String searchValue;
......@@ -59,11 +64,28 @@ public class WeightManEntity extends BaseObservable implements Parcelable {
}
protected WeightManEntity(Parcel in) {
unid = in.readString();
cattleresumeId = in.readString();
weight = in.readString();
if (in.readByte() == 0) {
unid = null;
} else {
unid = in.readLong();
}
if (in.readByte() == 0) {
cattleresumeId = null;
} else {
cattleresumeId = in.readLong();
}
if (in.readByte() == 0) {
weight = null;
} else {
weight = in.readDouble();
}
wTime = in.readString();
uploadStatus = in.readString();
deptId = in.readString();
if (in.readByte() == 0) {
deptId = null;
} else {
deptId = in.readLong();
}
searchValue = in.readString();
createBy = in.readString();
createTime = in.readString();
......@@ -72,13 +94,14 @@ public class WeightManEntity extends BaseObservable implements Parcelable {
remark = in.readString();
}
@Generated(hash = 445089683)
public WeightManEntity(String unid, String cattleresumeId, String weight,
String uploadStatus, String deptId, String searchValue, String createBy,
@Generated(hash = 90669287)
public WeightManEntity(Long unid, Long cattleresumeId, Double weight, String wTime,
String uploadStatus, Long deptId, String searchValue, String createBy,
String createTime, String updateBy, String updateTime, String remark) {
this.unid = unid;
this.cattleresumeId = cattleresumeId;
this.weight = weight;
this.wTime = wTime;
this.uploadStatus = uploadStatus;
this.deptId = deptId;
this.searchValue = searchValue;
......@@ -91,11 +114,32 @@ public class WeightManEntity extends BaseObservable implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(unid);
dest.writeString(cattleresumeId);
dest.writeString(weight);
if (unid == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(unid);
}
if (cattleresumeId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(cattleresumeId);
}
if (weight == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeDouble(weight);
}
dest.writeString(wTime);
dest.writeString(uploadStatus);
dest.writeString(deptId);
if (deptId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(deptId);
}
dest.writeString(searchValue);
dest.writeString(createBy);
dest.writeString(createTime);
......@@ -121,30 +165,38 @@ public class WeightManEntity extends BaseObservable implements Parcelable {
}
};
public String getUnid() {
public Long getUnid() {
return unid;
}
public void setUnid(String unid) {
public void setUnid(Long unid) {
this.unid = unid;
}
public String getCattleresumeId() {
public Long getCattleresumeId() {
return cattleresumeId;
}
public void setCattleresumeId(String cattleresumeId) {
public void setCattleresumeId(Long cattleresumeId) {
this.cattleresumeId = cattleresumeId;
}
public String getWeight() {
public Double getWeight() {
return weight;
}
public void setWeight(String weight) {
public void setWeight(Double weight) {
this.weight = weight;
}
public String getwTime() {
return wTime;
}
public void setwTime(String wTime) {
this.wTime = wTime;
}
public String getUploadStatus() {
return uploadStatus;
}
......@@ -153,11 +205,11 @@ public class WeightManEntity extends BaseObservable implements Parcelable {
this.uploadStatus = uploadStatus;
}
public String getDeptId() {
public Long getDeptId() {
return deptId;
}
public void setDeptId(String deptId) {
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
......@@ -211,10 +263,11 @@ public class WeightManEntity extends BaseObservable implements Parcelable {
@Override
public String toString() {
return "WeightingEntity{" +
return "WeightManEntity{" +
"unid='" + unid + '\'' +
", cattleresumeId='" + cattleresumeId + '\'' +
", weight='" + weight + '\'' +
", wTime='" + wTime + '\'' +
", uploadStatus='" + uploadStatus + '\'' +
", deptId='" + deptId + '\'' +
", searchValue='" + searchValue + '\'' +
......@@ -225,4 +278,13 @@ public class WeightManEntity extends BaseObservable implements Parcelable {
", remark='" + remark + '\'' +
'}';
}
public String getWTime() {
return this.wTime;
}
public void setWTime(String wTime) {
this.wTime = wTime;
}
}
app/src/main/java/com/phlx/anchorcollect/event/EventMsg.java
View file @ 53296ef1
package com.phlx.anchorcollect.event;
import android.os.Parcel;
import android.os.Parcelable;
/**
* <pre>
* author : lei
* e-mail : 18600395998@163.com
* time : 2019/08/26
* desc :
* time : 2019/06/10
* desc : RxBus数据模型类
* version: 1.0
* </pre>
*/
public class EventMsg<T> implements Parcelable {
public class EventMsg<T> {
private String action;
private T obj;
private String key;
public EventMsg() {
}
private T data;
public EventMsg(String action, T obj) {
this.action = action;
this.obj = obj;
}
protected EventMsg(Parcel in) {
action = in.readString();
}
public EventMsg(String key) {
this.key = key;
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(action);
}
public EventMsg(String key, T data) {
this.key = key;
this.data = data;
@Override
public int describeContents() {
return 0;
}
public static final Creator<EventMsg> CREATOR = new Creator<EventMsg>() {
@Override
public EventMsg createFromParcel(Parcel in) {
return new EventMsg(in);
}
@Override
public EventMsg[] newArray(int size) {
return new EventMsg[size];
}
};
public String getAction() {
return action;
}
public String getKey() {
return key;
public void setAction(String action) {
this.action = action;
}
public void setKey(String key) {
this.key = key;
public T getObj() {
return obj;
}
public T getData() {
return data;
public void setObj(T obj) {
this.obj = obj;
}
public void setData(T data) {
this.data = data;
@Override
public String toString() {
return "EventMsg{" +
"action='" + action + '\'' +
", obj=" + obj +
'}';
}
}
app/src/main/java/com/phlx/anchorcollect/event/EventTag.java
View file @ 53296ef1
......@@ -14,6 +14,16 @@ public class EventTag {
//盘点数据
public final static String EVENT_INVENTORY_DATA = "inventory_data_event";//正常
//重量数据
public final static String EVENT_WEIGHT_DATA_BASICS = "basics_weight_data_event";//正常
public final static String EVENT_WEIGHT_DATA_WEIGHT = "weight_weight_data_event";//正常
//蓝牙链接成功
public final static String EVENT_BT_SUCC = "bt_succ_event";//
//蓝牙链接失败
public final static String EVENT_BT_FAIL = "bt_fail_event";//
}
......
app/src/main/java/com/phlx/anchorcollect/net/RetrofitClient.java
View file @ 53296ef1
......@@ -50,12 +50,13 @@ public class RetrofitClient {
private static final int CACHE_TIMEOUT = 10 * 1024 * 1024;
//服务端根路径
public static String baseUrl =
// "58.18.92.126"//正式
"192.168.8.135"//董
"39.101.170.186"//正式
// "192.168.8.135"//董
// "192.168.43.154"//张敏
;
public static String port =
// "899"//正式
"80"//董
"9000"//正式
// "9000"//董
;
private static Context mContext = Utils.getContext();
......
app/src/main/java/com/phlx/anchorcollect/params/BaseResponse.java 0 → 100644
View file @ 53296ef1
package com.phlx.anchorcollect.params;
/**
* <pre>
* author : lei
* e-mail : 18600395998@163.com
* time : 2020/05/08
* desc :
* version: 1.0
* </pre>
*/
public class BaseResponse<T> {
private int code;
private String msg;
private T data;
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public T getData() {
return data;
}
public void setData(T data) {
this.data = data;
}
@Override
public String toString() {
return "BaseResponse{" +
"code=" + code +
", msg='" + msg + '\'' +
", data=" + data +
'}';
}
}
app/src/main/java/com/phlx/anchorcollect/rfid/DeviceControl.java
View file @ 53296ef1
......@@ -14,7 +14,18 @@ class DeviceControl {
void PowerOnDevice() {
try {
WriteFile("/sys/class/misc/mtgpio/pin", "-wdout94 1");
//RM_7088_MT2
//手持机
// WriteFile("/sys/class/misc/mtgpio/pin", "-wdout94 1");
//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");
//RM_SD100T_MT1
// WriteFile("/sys/bus/platform/drivers/mediatek-pinctrl/10005000.pinctrl/mt_gpio", "out55 1");
Thread.sleep(300);
} catch (IOException | InterruptedException e) {
......@@ -25,7 +36,17 @@ class DeviceControl {
void PowerOffDevice() {
try {
WriteFile("/sys/class/misc/mtgpio/pin", "-wdout94 0");
//RM_7088_MT2
//手持机
// WriteFile("/sys/class/misc/mtgpio/pin", "-wdout94 0");
//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");
//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
View file @ 53296ef1
......@@ -7,7 +7,11 @@ import com.uhf.structures.Rfid_Value;
public class ModuleManager {
public static int openCom() {
return App.getInstance().getLinkage().open_serial("/dev/ttyMT2");
//手持机
// return App.getInstance().getLinkage().open_serial("/dev/ttyMT2");
//pad
return App.getInstance().getLinkage().open_serial("/dev/ttyMT1");
}
public static void destroyLibSO() {
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/BasicsCollectFragment.java
View file @ 53296ef1
......@@ -29,14 +29,11 @@ import com.bigkoo.pickerview.view.TimePickerView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.kongzue.dialogx.datepicker.DatePickerDialog;
import com.kongzue.dialogx.datepicker.interfaces.OnDateSelected;
import com.kongzue.dialogx.dialogs.BottomMenu;
import com.kongzue.dialogx.dialogs.InputDialog;
import com.kongzue.dialogx.interfaces.OnInputDialogButtonClickListener;
import com.kongzue.dialogx.interfaces.OnMenuItemClickListener;
import com.kongzue.dialogx.util.InputInfo;
import com.kongzue.dialogx.util.TextInfo;
import com.phlx.anchorcollect.App;
import com.phlx.anchorcollect.BR;
import com.phlx.anchorcollect.Configs;
import com.phlx.anchorcollect.R;
......@@ -44,19 +41,16 @@ import com.phlx.anchorcollect.data.VMFactory;
import com.phlx.anchorcollect.databinding.FragmentBasicsCollectBinding;
import com.phlx.anchorcollect.entity.DictEntity;
import com.phlx.anchorcollect.entity.GenTableColumn;
import com.phlx.anchorcollect.entity.UIParamEntity;
import com.phlx.anchorcollect.event.EventTag;
import com.phlx.anchorcollect.ui.fragment.vm.BasicsCollectVM;
import com.phlx.anchorcollect.ui.fragment.vm.CollectVM;
import com.phlx.anchorcollect.ui.info.CattleActivity;
import com.phlx.anchorcollect.util.DictUtils;
import com.phlx.anchorcollect.util.ImagePicker;
import com.phlx.anchorcollect.util.TextUtil;
import com.phlx.anchorcollect.widget.SpaceItemDecoration;
import com.tbruyelle.rxpermissions2.RxPermissions;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
......@@ -118,6 +112,23 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
binding.rvCollect.addItemDecoration(new SpaceItemDecoration(16));
initTimePicker();
}
@Override
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (!hidden) {
viewModel.addInventoryListener();
viewModel.initDataForUnid(Configs.tempUnid);
Configs.currentEvent = EventTag.EVENT_WEIGHT_DATA_BASICS;
} else {
viewModel.removeInventoryListener();
Configs.currentEvent = "";
App.getInstance().getLinkage().stopInventory();
viewModel.isScan = false;
}
}
@Override
......@@ -155,6 +166,7 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
}
});
//可视化耳标输入
viewModel.onTagClickEvent.observe(getActivity(), new Observer<Boolean>() {
@Override
public void onChanged(Boolean aBoolean) {
......@@ -173,7 +185,7 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
@Override
public boolean onClick(InputDialog baseDialog, View v, String inputStr) {
viewModel.tag.set(inputStr);
viewModel.initData(inputStr);
viewModel.initDataForTag(inputStr);
return false;
}
});
......@@ -181,15 +193,15 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
}
});
//牲畜信息列表
viewModel.onCattleClickEvent.observe(getActivity(), new Observer<Boolean>() {
@Override
public void onChanged(Boolean aBoolean) {
//TODO 修改验证方式
if (TextUtil.isSpace(viewModel.tag.get())) {
ToastUtils.showShort("请先输入可视耳标号");
if (Configs.tempUnid == null) {
ToastUtils.showShort("请先扫描耳标");
} else {
Bundle bundle = new Bundle();
bundle.putString("Tag", viewModel.tag.get());
bundle.putLong("unid", Configs.tempUnid);
startActivity(CattleActivity.class, bundle);
}
......@@ -199,8 +211,8 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
viewModel.onNotifyAllEvent.observe(getActivity(), new Observer<Boolean>() {
@Override
public void onChanged(Boolean aBoolean) {
if (aBoolean)
viewModel.clearParamList();
// if (aBoolean)
// viewModel.clearParamList();
for (GenTableColumn gtc : viewModel.uiList) {
gtc.notifyChange();
......@@ -211,8 +223,8 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
File[] files;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
files = getContext().getExternalFilesDirs(Environment.MEDIA_MOUNTED);
for(File file:files){
Log.e("main",file.getPath());
for (File file : files) {
Log.e("main", file.getPath());
}
}
Glide.with(getContext())
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/BreedingRecordFragment.java
View file @ 53296ef1
......@@ -26,6 +26,7 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.bigkoo.pickerview.view.TimePickerView;
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;
......@@ -441,6 +442,9 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
viewModel.clearParamList();
viewModel.clearDetailParamList();
viewModel.queryBreedingRecord();
viewModel.rfid.set(Configs.tempRfid);
} else {
viewModel.rfid.set("");
}
}
}
app/src/main/java/com/phlx/anchorcollect/ui/fragment/CollectListFragment.java deleted 100644 → 0
View file @ a781e5e7
package com.phlx.anchorcollect.ui.fragment;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders;
import com.phlx.anchorcollect.BR;
import com.phlx.anchorcollect.Configs;
import com.phlx.anchorcollect.R;
import com.phlx.anchorcollect.data.VMFactory;
import com.phlx.anchorcollect.databinding.FragmentCollectListBinding;
import com.phlx.anchorcollect.ui.fragment.vm.CollectListVM;
import com.phlx.anchorcollect.ui.fragment.vm.CollectVM;
import com.phlx.anchorcollect.ui.main.MainActivity;
import me.goldze.mvvmhabit.base.BaseFragment;
public class CollectListFragment extends BaseFragment<FragmentCollectListBinding, CollectListVM> {
private String collectType;
public static CollectListFragment newInstance(String text) {
CollectListFragment collectListFragment = new CollectListFragment();
Bundle bundle = new Bundle();
bundle.putString("collectType", text);
collectListFragment.setArguments(bundle);
return collectListFragment;
}
@Override
public int initContentView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
return R.layout.fragment_collect_list;
}
@Override
public int initVariableId() {
return BR.viewModel;
}
@Override
public void initParam() {
super.initParam();
if (getArguments() != null) {
//取出保存的值
collectType = getArguments().getString("collectType");
}
}
@Override
public CollectListVM initViewModel() {
VMFactory factory = VMFactory.getInstance(getActivity().getApplication());
return ViewModelProviders.of(this, factory).get(CollectListVM.class);
}
@Override
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
//刷新列表
if (!hidden)
viewModel.refreshList();
}
@Override
public void initData() {
super.initData();
viewModel.setCollectType(collectType);
}
@Override
public void initViewObservable() {
super.initViewObservable();
viewModel.onItemClickEvent.observe(getActivity(), new Observer<Boolean>() {
@Override
public void onChanged(Boolean aBoolean) {
MainActivity mainActivity = (MainActivity)getActivity();
mainActivity.labelSwitching(0);
}
});
}
}
app/src/main/java/com/phlx/anchorcollect/ui/fragment/ImmunRecordFragment.java
View file @ 53296ef1
......@@ -346,10 +346,10 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
viewModel.clearParamList();
//说明是列表跳转的
if(!StringUtils.isEmpty(Configs.resumeId)){
if (Configs.resumeId != null) {
viewModel.isModify = true;
viewModel.queryImmuneBatch();
}else{
} else {
//清除一下数据
viewModel.isModify = false;
binding.rvCollect.getAdapter().notifyDataSetChanged();
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/MedicalRecordFragment.java
View file @ 53296ef1
......@@ -163,7 +163,6 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
}
//选择框
private void showSpinnerDialog(GenTableColumn uiParamEntity) {
......@@ -345,14 +344,17 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
viewModel.clearParamList();
//说明是列表跳转的
if(!StringUtils.isEmpty(Configs.resumeId)){
if (Configs.resumeId != null) {
viewModel.isModify = true;
viewModel.queryMedicalRecord();
}else{
} else {
//清除一下数据
viewModel.isModify = false;
binding.rvCollect.getAdapter().notifyDataSetChanged();
}
viewModel.rfid.set(Configs.tempRfid);
} else {
viewModel.rfid.set("");
}
}
}
app/src/main/java/com/phlx/anchorcollect/ui/fragment/PerformanceFragment.java
View file @ 53296ef1
......@@ -164,7 +164,6 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
}
//选择框
private void showSpinnerDialog(GenTableColumn uiParamEntity) {
......@@ -346,14 +345,17 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
viewModel.clearParamList();
//说明是列表跳转的
if(!StringUtils.isEmpty(Configs.resumeId)){
if (Configs.resumeId != null) {
viewModel.isModify = true;
viewModel.queryPerformance();
}else{
} else {
//清除一下数据
viewModel.isModify = false;
binding.rvCollect.getAdapter().notifyDataSetChanged();
}
viewModel.rfid.set(Configs.tempRfid);
} else {
viewModel.rfid.set("");
}
}
}
app/src/main/java/com/phlx/anchorcollect/ui/fragment/list/CollectGridItem.java
View file @ 53296ef1
......@@ -6,28 +6,25 @@ import androidx.annotation.NonNull;
import androidx.databinding.ObservableField;
import com.phlx.anchorcollect.Configs;
import com.phlx.anchorcollect.R;
import com.phlx.anchorcollect.entity.GenTableColumn;
import com.phlx.anchorcollect.ui.fragment.vm.BasicsCollectVM;
import com.phlx.anchorcollect.ui.fragment.vm.BreedingRecordVM;
import com.phlx.anchorcollect.ui.fragment.vm.ImmunRecordVM;
import com.phlx.anchorcollect.ui.fragment.vm.MedicalRecordVM;
import com.phlx.anchorcollect.ui.fragment.vm.PerformanceVM;
import com.phlx.anchorcollect.ui.fragment.vm.WeightManVM;
import cn.hutool.core.util.IdUtil;
import me.goldze.mvvmhabit.base.BaseViewModel;
import me.goldze.mvvmhabit.base.ItemViewModel;
import me.goldze.mvvmhabit.binding.command.BindingAction;
import me.goldze.mvvmhabit.binding.command.BindingCommand;
import me.goldze.mvvmhabit.utils.StringUtils;
import me.goldze.mvvmhabit.utils.ToastUtils;
public class CollectGridItem extends ItemViewModel<BaseViewModel> {
public ObservableField<GenTableColumn> entity = new ObservableField<>();
public ObservableField<Integer> titleGrayColor = new ObservableField<>(View.VISIBLE);
public ObservableField<Integer> titleBlueColor = new ObservableField<>(View.GONE);
public ObservableField<Integer> titleGrayVisiable = new ObservableField<>(View.VISIBLE);
public ObservableField<Integer> titleBlueVisiable = new ObservableField<>(View.GONE);
private String fragmentType;
......@@ -46,20 +43,20 @@ public class CollectGridItem extends ItemViewModel<BaseViewModel> {
case Configs.WEIGHTING_MANAGE:
if("1".equals(entity.get().getIsEdit())){
titleGrayColor.set(View.GONE);
titleBlueColor.set(View.VISIBLE);
titleGrayVisiable.set(View.GONE);
titleBlueVisiable.set(View.VISIBLE);
}else {
titleGrayColor.set(View.VISIBLE);
titleBlueColor.set(View.GONE);
titleGrayVisiable.set(View.VISIBLE);
titleBlueVisiable.set(View.GONE);
}
break;
default:
if("1".equals(entity.get().getIsInsert())){
titleGrayColor.set(View.GONE);
titleBlueColor.set(View.VISIBLE);
titleGrayVisiable.set(View.GONE);
titleBlueVisiable.set(View.VISIBLE);
}else {
titleGrayColor.set(View.VISIBLE);
titleBlueColor.set(View.GONE);
titleGrayVisiable.set(View.VISIBLE);
titleBlueVisiable.set(View.GONE);
}
break;
}
......@@ -77,7 +74,7 @@ public class CollectGridItem extends ItemViewModel<BaseViewModel> {
((PerformanceVM)viewModel).onItemClick(entity.get());
break;
case Configs.WEIGHTING_MANAGE:
((WeightManVM)viewModel).onItemClick(entity.get());
break;
case Configs.TREATMENT_RECORD:
((MedicalRecordVM)viewModel).onItemClick(entity.get());
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/list/CollectItem.java deleted 100644 → 0
View file @ a781e5e7
package com.phlx.anchorcollect.ui.fragment.list;
import androidx.annotation.NonNull;
import androidx.databinding.ObservableField;
import com.phlx.anchorcollect.Configs;
import com.phlx.anchorcollect.entity.CardEntity;
import com.phlx.anchorcollect.ui.fragment.vm.CollectListVM;
import me.goldze.mvvmhabit.base.ItemViewModel;
import me.goldze.mvvmhabit.binding.command.BindingAction;
import me.goldze.mvvmhabit.binding.command.BindingCommand;
public class CollectItem extends ItemViewModel<CollectListVM> {
public ObservableField<String> content1 = new ObservableField<>("");
public ObservableField<String> content2 = new ObservableField<>("");
public ObservableField<String> content3 = new ObservableField<>("");
public ObservableField<String> content4 = new ObservableField<>("");
public CollectItem(@NonNull CollectListVM viewModel, String content1, String content2, String content3, String content4) {
super(viewModel);
this.content1.set(content1);
this.content2.set(content2);
this.content3.set(content3);
this.content4.set(content4);
}
//条目的点击事件
public BindingCommand itemClick = new BindingCommand(new BindingAction() {
@Override
public void call() {
Configs.tempTag = content1.get();
viewModel.changeTab();
}
});
}
app/src/main/java/com/phlx/anchorcollect/ui/fragment/vm/BreedingRecordVM.java
View file @ 53296ef1
......@@ -55,6 +55,8 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
private String imgUrl;
private File imgFile;
public ObservableField<String> rfid = new ObservableField<>("");
//存放非list控件
public List<GenTableColumn> uiList = new ArrayList<>();
public GenTableColumn currentParamEntity;
......@@ -114,6 +116,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
remarkParamEntity.setColumnComment("备注");
remarkParamEntity.setHtmlType("input");
remarkParamEntity.setJavaType("String");
remarkParamEntity.setIsEdit("1");
}
......@@ -160,6 +163,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
tempEntity.setCreateBy(breedingRecordEntity.getCreateBy());
tempEntity.setCreateTime(breedingRecordEntity.getCreateTime());
tempEntity.setDeptId(breedingRecordEntity.getDeptId());
tempEntity.setCattleresumeId(breedingRecordEntity.getCattleresumeId());
String[] filedName = EntityUtils.getFiledName(breedingRecordEntity);
for (String name : filedName) {
......@@ -213,6 +217,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
}
onNotifyAllEvent.setValue(false);
ToastUtils.showShort("查询-配种记录子表-成功!");
}
@Override
......@@ -238,6 +243,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
tempDetailEntity.setCreateBy(brdEntity.getCreateBy());
tempDetailEntity.setCreateTime(brdEntity.getCreateTime());
tempDetailEntity.setDeptId(brdEntity.getDeptId());
tempDetailEntity.setCattleresumeId(brdEntity.getCattleresumeId());
String[] filedName = EntityUtils.getFiledName(brdEntity);
for (String name : filedName) {
......@@ -277,7 +283,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
public void onItemClick(GenTableColumn entity) {
if (StringUtils.isEmpty(Configs.tempUnid)) {
if (Configs.tempUnid==null) {
ToastUtils.showShort("请扫描耳标或者输入耳标信息");
return;
}
......@@ -290,7 +296,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
public void click(int id) {
if (StringUtils.isEmpty(Configs.tempUnid)) {
if (Configs.tempUnid==null) {
ToastUtils.showShort("请扫描耳标或者输入耳标信息");
return;
}
......@@ -328,15 +334,16 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
Gson gson = new Gson();
BreedingRecordEntity breedingRecordEntity = gson.fromJson(jsonObject, BreedingRecordEntity.class);
if (tempEntity.getUnid() == null) {//新增
breedingRecordEntity.setUnid(IdUtil.createSnowflake(3, 1).nextId() + "");
breedingRecordEntity.setDeptId(SPUtils.getInstance().getString(Configs.SP_DEPT_ID));
breedingRecordEntity.setUnid(IdUtil.createSnowflake(3, 1).nextId());
breedingRecordEntity.setDeptId(SPUtils.getInstance().getLong(Configs.SP_DEPT_ID));
breedingRecordEntity.setCattleresumeId(Configs.tempUnid);
dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
breedingRecordEntity.setCreateTime(dateFormat.format(new Date()));
breedingRecordEntity.setCreateBy(SPUtils.getInstance().getString(Configs.SP_LOGIN_NAME));
} else {
breedingRecordEntity.setUnid(tempEntity.getUnid());
breedingRecordEntity.setCreateBy(tempEntity.getCreateBy());
breedingRecordEntity.setCattleresumeId(tempEntity.getCattleresumeId());
breedingRecordEntity.setCreateTime(tempEntity.getCreateTime());
breedingRecordEntity.setDeptId(tempEntity.getDeptId());
......@@ -355,8 +362,9 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
public void onNotification(boolean result) {
dismissDialog();
if (result) {
saveBreedingRecordDetail();
tempEntity = breedingRecordEntity;
onShowDialogEvent.setValue("保存-配种记录主表-成功!");
saveBreedingRecordDetail();
} else {
ToastUtils.showShort("保存-配种记录主表-失败");
}
......@@ -375,9 +383,9 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
Gson gson = new Gson();
BreedingRecordDetailEntity breedingRecordDetailEntity = gson.fromJson(jsonObject, BreedingRecordDetailEntity.class);
if (tempDetailEntity.getUnid() == null) {//新增
breedingRecordDetailEntity.setUnid(IdUtil.createSnowflake(3, 1).nextId() + "");
breedingRecordDetailEntity.setDeptId(SPUtils.getInstance().getString(Configs.SP_DEPT_ID));
breedingRecordDetailEntity.setUnid(IdUtil.createSnowflake(3, 1).nextId());
breedingRecordDetailEntity.setDeptId(SPUtils.getInstance().getLong(Configs.SP_DEPT_ID));
breedingRecordDetailEntity.setCattleresumeId(Configs.tempUnid);
dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
breedingRecordDetailEntity.setCreateTime(dateFormat.format(new Date()));
breedingRecordDetailEntity.setCreateBy(SPUtils.getInstance().getString(Configs.SP_LOGIN_NAME));
......@@ -386,7 +394,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
breedingRecordDetailEntity.setCreateBy(tempDetailEntity.getCreateBy());
breedingRecordDetailEntity.setCreateTime(tempDetailEntity.getCreateTime());
breedingRecordDetailEntity.setDeptId(tempDetailEntity.getDeptId());
breedingRecordDetailEntity.setCattleresumeId(tempDetailEntity.getCattleresumeId());
dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
breedingRecordDetailEntity.setUpdateTime(dateFormat.format(new Date()));
breedingRecordDetailEntity.setUpdateBy(SPUtils.getInstance().getString(Configs.SP_LOGIN_NAME));
......@@ -404,8 +412,6 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
if (result) {
clearDetailParamList();
initDetailList(tempEntity);
onNotifyAllEvent.setValue(false);
onShowDialogEvent.setValue("保存-配种记录子表-成功!");
} else {
ToastUtils.showShort("保存-配种记录子表-失败");
}
......
app/src/main/java/com/phlx/anchorcollect/ui/login/LoginActivity.java
View file @ 53296ef1
......@@ -127,7 +127,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding, LoginVM> {
//设置强制更新
.setForcedUpgrade(true);
DownloadManager manager = DownloadManager.getInstance(this);
manager.setApkName("WoolManager.apk")
manager.setApkName("AnchorCollect.apk")
.setApkUrl(downloadUrl)
.setSmallIcon(R.mipmap.ic_launcher)
.setShowNewerToast(true)
......
app/src/main/res/layout/activity_sync.xml
View file @ 53296ef1
This diff is collapsed.
app/src/main/res/layout/fragment_collect_list.xml deleted 100644 → 0
View file @ a781e5e7
This diff is collapsed.
app/src/main/res/layout/item_collect_rv.xml deleted 100644 → 0
View file @ a781e5e7
This diff is collapsed.
mycontrol/src/main/res/values/ids.xml
View file @ 53296ef1
This diff is collapsed.
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