Skip to content

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

1.性能测定带实时重量； 

2.输入框点其他位置不取消
parent 15b33a45
Show whitespace changes
Inline Side-by-side
Showing with 145 additions and 111 deletions
app/src/main/java/com/phlx/anchorcollect/bt/BtService.java
View file @ beed5e0a
......@@ -69,7 +69,7 @@ public class BtService extends Service implements EventObserver {
public void onRead(@NonNull BluetoothDevice device, @NonNull byte[] value) {
String data = new String(value);
Log.e(TAG, "onRead: " + data);
// Log.e(TAG, "onRead: " + data);
// ToastUtils.showShort("onRead: " + data);
String weightData = data.substring(data.indexOf("wn") + 3, data.indexOf("kg"));
......
app/src/main/java/com/phlx/anchorcollect/entity/BreedingRecordDetailEntity.java
View file @ beed5e0a
......@@ -37,7 +37,7 @@ public class BreedingRecordDetailEntity extends BaseObservable implements Parcel
private String matingStyle;
/**
* 种畜耳标号
* 本交公牛种畜主键号
*/
private Long cattleresumeId;
......
app/src/main/java/com/phlx/anchorcollect/net/RetrofitClient.java
View file @ beed5e0a
......@@ -50,15 +50,15 @@ public class RetrofitClient {
private static final int CACHE_TIMEOUT = 10 * 1024 * 1024;
//服务端根路径
public static String baseUrl =
// "serve.xlglmnmyzspt.org.cn"//正式
"serve.xlglmnmyzspt.org.cn"//正式
// "39.101.170.186"//阿里云测试
"192.168.8.135"//董
// "192.168.8.135"//董
// "192.168.43.154"//张敏
;
public static String port =
// ""//正式
""//正式
// "9000"//阿里云测试
"9000"//董
// "9000"//董
;
private static Context mContext = Utils.getContext();
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/BasicsCollectFragment.java
View file @ beed5e0a
......@@ -126,6 +126,7 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
viewModel.initDataForUnid(Configs.tempUnid);
Configs.currentEvent = EventTag.EVENT_WEIGHT_DATA_BASICS;
} else {
Configs.currentEvent = EventTag.EVENT_WEIGHT_DATA_BASICS;
viewModel.removeInventoryListener();
Configs.currentEvent = "";
App.getInstance().getLinkage().stopInventory();
......@@ -355,6 +356,7 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/BreedingRecordFragment.java
View file @ beed5e0a
......@@ -205,7 +205,7 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
private void showCheckboxDialog(GenTableColumn uiParamEntity) {
new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
.cancelable(false).canceledOnTouchOutside(false)
// .cancelable(false).canceledOnTouchOutside(false)
.positiveText("确定")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
......@@ -270,6 +270,7 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/ImmunRecordFragment.java
View file @ beed5e0a
......@@ -255,6 +255,7 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/MedicalRecordFragment.java
View file @ beed5e0a
......@@ -253,6 +253,7 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/PerformanceFragment.java
View file @ beed5e0a
......@@ -256,6 +256,7 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/WeightManFragment.java
View file @ beed5e0a
......@@ -393,6 +393,7 @@ public class WeightManFragment extends BaseFragment<FragmentWeightmanBinding, We
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/vm/BasicsCollectVM.java
View file @ beed5e0a
......@@ -575,7 +575,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
Double weightNum = Double.parseDouble(eventType.getObj().toString().trim());
if (weightNum > 25) {
scanRfid();
if (isWeightScan)
// if (isWeightScan)
Configs.tempWeight = weightNum;
isWeightScan = false;
} else {
......@@ -608,7 +608,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
Configs.tempUnid = null;
Configs.tempRfid = "";
Configs.tempCattleResume = null;
Configs.tempWeight = 0.0;
// Configs.tempWeight = 0.0;
tag.set("");
rfid.set("");
rfidTag = "";
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/vm/WeightManVM.java
View file @ beed5e0a
......@@ -657,7 +657,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
Double weightNum = Double.parseDouble(eventType.getObj().toString().trim());
if (weightNum > 25) {
scanRfid();
if (isWeightScan)
// if (isWeightScan)
Configs.tempWeight = weightNum;
isWeightScan = false;
} else {
......@@ -700,7 +700,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
Configs.tempUnid = null;
Configs.tempRfid = "";
Configs.tempCattleResume = null;
Configs.tempWeight = 0.0;
// Configs.tempWeight = 0.0;
tag.set("");
rfid.set("");
rfidTag = "";
......
app/src/main/java/com/phlx/anchorcollect/ui/info/CattleActivity.java
View file @ beed5e0a
......@@ -303,7 +303,7 @@ public class CattleActivity extends BaseActivity<AvtivityCattleBinding, CattleVM
//初始化表头
List<String> headerStr = new ArrayList<>();
List<String> fieldNameStr = new ArrayList<>();
for (GenTableColumn gtc : Configs.cattlematingMaster) {
for (GenTableColumn gtc : Configs.cattlematingDetaillList) {
if ("1".equals(gtc.getIsList())) {
headerStr.add(gtc.getColumnComment());
fieldNameStr.add(gtc.getJavaField());
......@@ -336,30 +336,33 @@ public class CattleActivity extends BaseActivity<AvtivityCattleBinding, CattleVM
// 初始化表格
mDataGridView.initDataGridView();
// mDataGridView.setOnItemCellClickListener(new RecyclerviewAdapter.OnItemCellClickListener() {
// @Override
// public void onClick(View v, int row, int column) {
//// ToastUtils.showShort("row:" + row + " column:" + column);
// BreedingRecordEntity rowData = (BreedingRecordEntity) (mDataGridView.getRowData(row));
//
// new MaterialDialog
// .Builder(CattleActivity.this)
// .title("替换提示")
// .content("要跳转配种数据详情吗?")
// .positiveText("确定")
// .negativeText("取消")
// .onPositive(new MaterialDialog.SingleButtonCallback() {
// @Override
// public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// if (which == DialogAction.POSITIVE) {
//
// }
// }
// }).show();
// }
// });
mDataGridView.setOnItemCellClickListener(new RecyclerviewAdapter.OnItemCellClickListener() {
@Override
public void onClick(View v, int row, int column) {
// ToastUtils.showShort("row:" + row + " column:" + column);
BreedingRecordDetailEntity rowData = (BreedingRecordDetailEntity) (mDataGridView.getRowData(row));
new MaterialDialog
.Builder(CattleActivity.this)
.title("替换提示")
.content("要跳转配种数据详情吗?")
.positiveText("确定")
.negativeText("取消")
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
if (which == DialogAction.POSITIVE) {
Configs.mainPosition = 5;
Configs.resumeId = rowData.getFUnid();
startActivity(MainActivity.class);
finish();
}
}
}).show();
}
});
viewModel.queryBreedingRecordList();
viewModel.queryBreedingRecordDetailList();
}
......
app/src/main/java/com/phlx/anchorcollect/ui/info/CattleVM.java
View file @ beed5e0a
......@@ -12,6 +12,7 @@ import com.phlx.anchorcollect.Configs;
import com.phlx.anchorcollect.R;
import com.phlx.anchorcollect.data.Repository;
import com.phlx.anchorcollect.db.DbUtil;
import com.phlx.anchorcollect.db.gen.BreedingRecordDetailEntityDao;
import com.phlx.anchorcollect.db.gen.BreedingRecordEntityDao;
import com.phlx.anchorcollect.db.gen.DictEntityDao;
import com.phlx.anchorcollect.db.gen.ImmuneBatchDetailEntityDao;
......@@ -19,6 +20,7 @@ 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.interf.DbQueryCallBack;
import com.phlx.anchorcollect.entity.BreedingRecordDetailEntity;
import com.phlx.anchorcollect.entity.BreedingRecordEntity;
import com.phlx.anchorcollect.entity.DictEntity;
import com.phlx.anchorcollect.entity.GenTableColumn;
......@@ -27,6 +29,7 @@ import com.phlx.anchorcollect.entity.ImmuneBatchEntity;
import com.phlx.anchorcollect.entity.MedicalRecordEntity;
import com.phlx.anchorcollect.entity.PerformanceEntity;
import com.phlx.anchorcollect.ui.base.BackBarVM;
import com.phlx.anchorcollect.util.DateUtils;
import com.phlx.anchorcollect.util.EntityUtils;
import org.greenrobot.greendao.query.QueryBuilder;
......@@ -53,6 +56,7 @@ public class CattleVM extends BackBarVM<Repository> {
private List<ImmuneBatchEntity> immuneBatchEntityList;
// private List<ImmuneBatchDetailEntity> immuneBatchDetailEntityList;
private List<BreedingRecordEntity> breedingRecordEntityList;
private List<BreedingRecordDetailEntity> breedingRecordDetailEntityList;
//给RecyclerView添加ItemBinding
public ItemBinding<CattleItem> itemBinding = ItemBinding.of(BR.viewModel, R.layout.item_cattle_rv);
......@@ -154,7 +158,7 @@ public class CattleVM extends BackBarVM<Repository> {
}
}).queryAsyncAll(ImmuneBatchEntity.class, builder);
}
}else{
} else {
observableRefreshList.setValue(2);
}
}
......@@ -192,6 +196,32 @@ public class CattleVM extends BackBarVM<Repository> {
}
public void queryBreedingRecordDetailList() {
QueryBuilder<BreedingRecordDetailEntity> builder =
DbUtil.getInstance().getQueryBuilder(BreedingRecordDetailEntity.class)
.where(BreedingRecordDetailEntityDao.Properties.CaId.eq(Configs.tempUnid)
, BreedingRecordDetailEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
)
.orderDesc(BreedingRecordDetailEntityDao.Properties.CreateTime);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
@Override
public void onSuccess(List<BreedingRecordDetailEntity> result) {
breedingRecordDetailEntityList = new ArrayList<>();
if (result != null && result.size() > 0) {
breedingRecordDetailEntityList = result;
}
observableRefreshList.setValue(3);
}
@Override
public void onFailed() {
ToastUtils.showShort("配种记录子表-数据库查询失败");
}
}).queryAsyncAll(BreedingRecordDetailEntity.class, builder);
}
public List<PerformanceEntity> getPerformanceEntityList() {
List<PerformanceEntity> resultList = new ArrayList<>();
......@@ -241,8 +271,8 @@ public class CattleVM extends BackBarVM<Repository> {
JsonObject jsonObject = new JsonObject();
for (GenTableColumn gtc : Configs.performance) {
//防止转json类型错误
if("".equals(gtc.getContent())){
switch (gtc.getJavaType()){
if ("".equals(gtc.getContent())) {
switch (gtc.getJavaType()) {
case "Long":
case "Double":
case "Integer":
......@@ -255,7 +285,7 @@ public class CattleVM extends BackBarVM<Repository> {
}
Gson gson = new Gson();
Long unidTemp =pe.getUnid();
Long unidTemp = pe.getUnid();
pe = gson.fromJson(jsonObject, PerformanceEntity.class);
pe.setUnid(unidTemp);
resultList.add(pe);
......@@ -317,8 +347,8 @@ public class CattleVM extends BackBarVM<Repository> {
JsonObject jsonObject = new JsonObject();
for (GenTableColumn gtc : Configs.medicalrecords) {
//防止转json类型错误
if("".equals(gtc.getContent())){
switch (gtc.getJavaType()){
if ("".equals(gtc.getContent())) {
switch (gtc.getJavaType()) {
case "Long":
case "Double":
case "Integer":
......@@ -331,7 +361,7 @@ public class CattleVM extends BackBarVM<Repository> {
}
Gson gson = new Gson();
Long unidTemp =pe.getUnid();
Long unidTemp = pe.getUnid();
pe = gson.fromJson(jsonObject, MedicalRecordEntity.class);
pe.setUnid(unidTemp);
resultList.add(pe);
......@@ -392,8 +422,8 @@ public class CattleVM extends BackBarVM<Repository> {
JsonObject jsonObject = new JsonObject();
for (GenTableColumn gtc : Configs.immunebatch) {
//防止转json类型错误
if("".equals(gtc.getContent())){
switch (gtc.getJavaType()){
if ("".equals(gtc.getContent())) {
switch (gtc.getJavaType()) {
case "Long":
case "Double":
case "Integer":
......@@ -406,7 +436,7 @@ public class CattleVM extends BackBarVM<Repository> {
}
Gson gson = new Gson();
Long unidTemp =pe.getUnid();
Long unidTemp = pe.getUnid();
pe = gson.fromJson(jsonObject, ImmuneBatchEntity.class);
pe.setUnid(unidTemp);
resultList.add(pe);
......@@ -419,22 +449,21 @@ public class CattleVM extends BackBarVM<Repository> {
}
public List<BreedingRecordEntity> getBreedingRecordEntityList() {
public List<BreedingRecordDetailEntity> getBreedingRecordEntityList() {
List<BreedingRecordEntity> resultList = new ArrayList<>();
List<BreedingRecordDetailEntity> resultList = new ArrayList<>();
if (breedingRecordEntityList == null) {
if (breedingRecordDetailEntityList == null) {
return resultList;
}
for (BreedingRecordEntity pe : breedingRecordEntityList) {
for (BreedingRecordDetailEntity pe : breedingRecordDetailEntityList) {
String[] filedName = EntityUtils.getFiledName(pe);
for (String name : filedName) {
for (GenTableColumn gtc : Configs.cattlematingMaster) {
for (GenTableColumn gtc : Configs.cattlematingDetaillList) {
if (name.equals(gtc.getJavaField())) {
try {
......@@ -468,10 +497,10 @@ public class CattleVM extends BackBarVM<Repository> {
//再把格式bean里的数据转换为数据bean
JsonObject jsonObject = new JsonObject();
for (GenTableColumn gtc : Configs.cattlematingMaster) {
for (GenTableColumn gtc : Configs.cattlematingDetaillList) {
//防止转json类型错误
if("".equals(gtc.getContent())){
switch (gtc.getJavaType()){
if ("".equals(gtc.getContent())) {
switch (gtc.getJavaType()) {
case "Long":
case "Double":
case "Integer":
......@@ -484,8 +513,8 @@ public class CattleVM extends BackBarVM<Repository> {
}
Gson gson = new Gson();
Long unidTemp =pe.getUnid();
pe = gson.fromJson(jsonObject, BreedingRecordEntity.class);
Long unidTemp = pe.getUnid();
pe = gson.fromJson(jsonObject, BreedingRecordDetailEntity.class);
pe.setUnid(unidTemp);
resultList.add(pe);
......
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted 100644 → 0
View file @ 15b33a45
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher" />
</adaptive-icon>
\ No newline at end of file
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View file @ beed5e0a
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher" />
<foreground android:drawable="@mipmap/ic_launcher" />
</adaptive-icon>
\ No newline at end of file
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