diff --git a/app/src/main/java/com/qhclh/ytzh/bean/MaojiScanBean.java b/app/src/main/java/com/qhclh/ytzh/bean/MaojiScanBean.java
new file mode 100644
index 0000000..1951ed6
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/bean/MaojiScanBean.java
@@ -0,0 +1,130 @@
+package com.qhclh.ytzh.bean;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+///< 扫一扫 毛鸡
+public class MaojiScanBean {
+ private int id;
+ private String infos_carname;
+ private String infos_driver;
+ private String infos_phone;
+
+ private String infos_yangzhichang;
+
+ private String daodayangzhichang;
+ private String likaiyangzhichang;
+
+ private String shipingchang;
+ private String daodashipingchang;
+
+ private String guajipingtai;
+ private String daodaguajipingtai;
+
+
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getInfos_carname() {
+ return infos_carname;
+ }
+
+ public void setInfos_carname(String infos_carname) {
+ this.infos_carname = infos_carname;
+ }
+
+ public String getInfos_driver() {
+ return infos_driver;
+ }
+
+ public void setInfos_driver(String infos_driver) {
+ this.infos_driver = infos_driver;
+ }
+
+ public String getInfos_phone() {
+ return infos_phone;
+ }
+
+ public void setInfos_phone(String infos_phone) {
+ this.infos_phone = infos_phone;
+ }
+
+ public String getInfos_yangzhichang() {
+ return infos_yangzhichang;
+ }
+
+ public void setInfos_yangzhichang(String infos_yangzhichang) {
+ this.infos_yangzhichang = infos_yangzhichang;
+ }
+
+ public String getDaodayangzhichang() {
+ return daodayangzhichang;
+ }
+
+ public void setDaodayangzhichang(String daodayangzhichang) {
+ this.daodayangzhichang = daodayangzhichang;
+ }
+
+ public String getLikaiyangzhichang() {
+ return likaiyangzhichang;
+ }
+
+ public void setLikaiyangzhichang(String likaiyangzhichang) {
+ this.likaiyangzhichang = likaiyangzhichang;
+ }
+
+ public String getShipingchang() {
+ return shipingchang;
+ }
+
+ public void setShipingchang(String shipingchang) {
+ this.shipingchang = shipingchang;
+ }
+
+ public String getDaodashipingchang() {
+ return daodashipingchang;
+ }
+
+ public void setDaodashipingchang(String daodashipingchang) {
+ this.daodashipingchang = daodashipingchang;
+ }
+
+ public String getGuajipingtai() {
+ return guajipingtai;
+ }
+
+ public void setGuajipingtai(String guajipingtai) {
+ this.guajipingtai = guajipingtai;
+ }
+
+ public String getDaodaguajipingtai() {
+ return daodaguajipingtai;
+ }
+
+ public void setDaodaguajipingtai(String daodaguajipingtai) {
+ this.daodaguajipingtai = daodaguajipingtai;
+ }
+
+ @Override
+ public String toString() {
+ return "MaojiScanBean{" +
+ "id=" + id +
+ ", infos_carname='" + infos_carname + '\'' +
+ ", infos_driver='" + infos_driver + '\'' +
+ ", infos_phone='" + infos_phone + '\'' +
+ ", infos_yangzhichang='" + infos_yangzhichang + '\'' +
+ ", daodayangzhichang='" + daodayangzhichang + '\'' +
+ ", likaiyangzhichang='" + likaiyangzhichang + '\'' +
+ ", shipingchang='" + shipingchang + '\'' +
+ ", daodashipingchang='" + daodashipingchang + '\'' +
+ ", guajipingtai='" + guajipingtai + '\'' +
+ ", daodaguajipingtai='" + daodaguajipingtai + '\'' +
+ '}';
+ }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java b/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java
index 929b259..db4dd62 100644
--- a/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java
+++ b/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java
@@ -3,35 +3,17 @@ package com.qhclh.ytzh.bean;
/**
* Created by 青花瓷 on 2017/11/30.
*/
-///< 扫一扫 毛鸡 鸡苗
+///< 扫一扫 鸡苗
public class ScanBean {
private int id;
private String infos_carname;
private String infos_driver;
private String infos_phone;
- private String infos_batch;
- private String infos_addrs;
- private String infos_time;
- private String infos_number;
- private String infos_immune;
- private String infos_uniformity;
- private String infos_startime;
- private String infos_endtime;
-
- public ScanBean(int id, String infos_carname, String infos_driver, String infos_phone, String infos_batch, String infos_addrs, String infos_time, String infos_number, String infos_immune, String infos_uniformity, String infos_startime, String infos_endtime) {
- this.id = id;
- this.infos_carname = infos_carname;
- this.infos_driver = infos_driver;
- this.infos_phone = infos_phone;
- this.infos_batch = infos_batch;
- this.infos_addrs = infos_addrs;
- this.infos_time = infos_time;
- this.infos_number = infos_number;
- this.infos_immune = infos_immune;
- this.infos_uniformity = infos_uniformity;
- this.infos_startime = infos_startime;
- this.infos_endtime = infos_endtime;
- }
+ private String infos_fuhuachang;
+ private String infos_leavetime;
+ private String infos_yangzhichang;
+ private String infos_daodashijian;
+
public int getId() {
return id;
@@ -65,85 +47,35 @@ public class ScanBean {
this.infos_phone = infos_phone;
}
- public String getInfos_batch() {
- return infos_batch;
- }
-
- public void setInfos_batch(String infos_batch) {
- this.infos_batch = infos_batch;
- }
-
- public String getInfos_addrs() {
- return infos_addrs;
- }
-
- public void setInfos_addrs(String infos_addrs) {
- this.infos_addrs = infos_addrs;
- }
-
- public String getInfos_time() {
- return infos_time;
- }
-
- public void setInfos_time(String infos_time) {
- this.infos_time = infos_time;
- }
-
- public String getInfos_number() {
- return infos_number;
- }
-
- public void setInfos_number(String infos_number) {
- this.infos_number = infos_number;
- }
-
- public String getInfos_immune() {
- return infos_immune;
- }
-
- public void setInfos_immune(String infos_immune) {
- this.infos_immune = infos_immune;
+ public String getInfos_fuhuachang() {
+ return infos_fuhuachang;
}
- public String getInfos_uniformity() {
- return infos_uniformity;
+ public void setInfos_fuhuachang(String infos_fuhuachang) {
+ this.infos_fuhuachang = infos_fuhuachang;
}
- public void setInfos_uniformity(String infos_uniformity) {
- this.infos_uniformity = infos_uniformity;
+ public String getInfos_leavetime() {
+ return infos_leavetime;
}
- public String getInfos_startime() {
- return infos_startime;
+ public void setInfos_leavetime(String infos_leavetime) {
+ this.infos_leavetime = infos_leavetime;
}
- public void setInfos_startime(String infos_startime) {
- this.infos_startime = infos_startime;
+ public String getInfos_yangzhichang() {
+ return infos_yangzhichang;
}
- public String getInfos_endtime() {
- return infos_endtime;
+ public void setInfos_yangzhichang(String infos_yangzhichang) {
+ this.infos_yangzhichang = infos_yangzhichang;
}
- public void setInfos_endtime(String infos_endtime) {
- this.infos_endtime = infos_endtime;
+ public String getInfos_daodashijian() {
+ return infos_daodashijian;
}
- @Override
- public String toString() {
- return "ScanBean{" +
- "id=" + id +
- ", infos_carname='" + infos_carname + '\'' +
- ", infos_driver='" + infos_driver + '\'' +
- ", infos_phone='" + infos_phone + '\'' +
- ", infos_batch='" + infos_batch + '\'' +
- ", infos_addrs='" + infos_addrs + '\'' +
- ", infos_time='" + infos_time + '\'' +
- ", infos_number='" + infos_number + '\'' +
- ", infos_immune='" + infos_immune + '\'' +
- ", infos_uniformity='" + infos_uniformity + '\'' +
- ", infos_startime='" + infos_startime + '\'' +
- ", infos_endtime='" + infos_endtime + '\'' +
- '}';
+ public void setInfos_daodashijian(String infos_daodashijian) {
+ this.infos_daodashijian = infos_daodashijian;
}
}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java
index 7a41e67..5568178 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java
@@ -33,10 +33,10 @@ public class ChicksFragment extends BaseFragment{
@Override
protected void initData() {
scanBeanList = new ArrayList<>();
- for (int i=0;i<4;i++){
- scanBeanList.add(new ScanBean(i,"车牌号"+i,"司机"+i,"联系方式"+i,"批次"+i,"厂址"+i,
- "时间"+i,"数量"+i,"免疫"+i,"均匀度"+i,"起始时间"+i,"到达时间"+i));
- }
+// for (int i=0;i<4;i++){
+// scanBeanList.add(new ScanBean(i,"车牌号"+i,"司机"+i,"联系方式"+i,"批次"+i,"厂址"+i,
+// "时间"+i,"数量"+i,"免疫"+i,"均匀度"+i,"起始时间"+i,"到达时间"+i));
+// }
scanAdapter = new ScanAdapter(getActivity(),scanBeanList);
lv_infos_chicks.setAdapter(scanAdapter);
}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java
index ba0a635..ea4cf20 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java
@@ -34,10 +34,10 @@ public class GrossChickenFragment extends BaseFragment {
@Override
protected void initData() {
scanBeanList = new ArrayList<>();
- for (int i=0;i<4;i++){
- scanBeanList.add(new ScanBean(i,"车牌号1"+i,"司机1"+i,"联系方式1"+i,"批次1"+i,"厂址1"+i,
- "时间1"+i,"数量1"+i,"免疫1"+i,"均匀度1"+i,"起始时间1"+i,"到达时间1"+i));
- }
+// for (int i=0;i<4;i++){
+// scanBeanList.add(new ScanBean(i,"车牌号1"+i,"司机1"+i,"联系方式1"+i,"批次1"+i,"厂址1"+i,
+// "时间1"+i,"数量1"+i,"免疫1"+i,"均匀度1"+i,"起始时间1"+i,"到达时间1"+i));
+// }
scanAdapter = new ScanAdapter(getActivity(),scanBeanList);
lv_infos_grosschicken.setAdapter(scanAdapter);
}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java b/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java
index c8c10e9..b7ec1a1 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java
@@ -13,6 +13,12 @@ import com.google.zxing.integration.android.IntentResult;
import com.qhclh.ytzh.R;
import com.qhclh.ytzh.base.BaseActivity;
import com.qhclh.ytzh.bean.ScanBean;
+import com.qhclh.ytzh.home.RpcUrl;
+import com.qhclh.ytzh.tasks.ViewOnClickTask;
+
+import org.forks.jsonrpc.JsonRpcResult;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
import java.util.ArrayList;
import java.util.List;
@@ -70,10 +76,30 @@ public class FumudaiScanResultActivity extends BaseActivity {
protected void onResume() {
super.onResume();
if (scanf == false) {
- dongtaiQuanxian();
+ getactive();
}
}
+ private RpcObject rpcObj;
+ private void getactive() {
+ ViewOnClickTask getactiveTask = new ViewOnClickTask(this,"加载中...") {
+
+ @Override
+ protected void successUI() {
+ System.out.println("aaa++++getactive++++"+rpcObj);
+ dongtaiQuanxian();
+ }
+
+ @Override
+ public Object call() throws Exception {
+ JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.ChickTransportLogRpc_getactive);
+ rpcObj = result.getRpcObject(RpcUrl.ChickTransportLogRpc_fanhui);
+ return null;
+ }
+ };
+ getactiveTask.execute();
+ }
+
private static final int REQUEST_PERMISSION_CAMERA_CODE = 102;
@@ -101,7 +127,11 @@ public class FumudaiScanResultActivity extends BaseActivity {
// 设置要扫描的条码类型，ONE_D_CODE_TYPES：一维码，QR_CODE_TYPES-二维码
integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES);
integrator.setCaptureActivity(ScanActivity.class);
- integrator.setPrompt("请扫描"); //底部的提示文字，设为""可以置空
+ if (rpcObj == null) {
+ integrator.setPrompt("离开孵化厂请扫描"); //底部的提示文字，设为""可以置空
+ }else {
+ integrator.setPrompt("到达养殖场请扫描");
+ }
integrator.setCameraId(0); //前置或者后置摄像头
integrator.setBeepEnabled(false); //扫描成功的「哔哔」声，默认开启
integrator.setBarcodeImageEnabled(true);
@@ -118,15 +148,40 @@ public class FumudaiScanResultActivity extends BaseActivity {
finish();
} else {
scanStr = result.getContents();
- for (int i=0;i<4;i++){
- scanBeanList.add(new ScanBean(i,"车牌号"+i,"司机"+i,"联系方式"+i,"批次"+i,"厂址"+i,
- "时间"+i,"数量"+i,"免疫"+i,"均匀度"+i,"起始时间"+i,"到达时间"+i));
+
+ if (rpcObj==null){
+ LeaveHatchery();
+ }else {
+ ArriveBreedFactory();
}
- scanAdapter = new ScanAdapter(this,scanBeanList);
- fumudai_lv_infos.setAdapter(scanAdapter);
}
} else {
super.onActivityResult(requestCode, resultCode, data);
}
}
+
+ private void ArriveBreedFactory() {
+ }
+
+ private void LeaveHatchery() {
+ ViewOnClickTask leaveTask = new ViewOnClickTask(this,"加载中...") {
+ @Override
+ protected void successUI() {
+ System.out.println("aaa++++leave++++"+rpcObj);
+// scanBeanList.add(new ScanBean(rpcObj.getLong("ID"),"车牌号"+i,"司机"+i,"联系方式"+i,"批次"+i,"厂址"+i,
+// "时间"+i,"数量"+i,"免疫"+i,"均匀度"+i,"起始时间"+i,"到达时间"+i));
+//
+// scanAdapter = new ScanAdapter(this,scanBeanList);
+// fumudai_lv_infos.setAdapter(scanAdapter);
+ }
+
+ @Override
+ public Object call() throws Exception {
+ JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.ChickTransportLogRpc_LeaveHatchery,scanStr);
+ rpcObj = result.getRpcObject(RpcUrl.ChickTransportLogRpc_fanhui);
+ return null;
+ }
+ };
+ leaveTask.execute();
+ }
}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanAdapter.java b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanAdapter.java
index 0bfbc57..006be2b 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanAdapter.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanAdapter.java
@@ -15,7 +15,7 @@ import java.util.List;
/**
* Created by 青花瓷 on 2017/11/30.
*/
-///< 扫一扫
+///< 扫一扫雏苗
public class ScanAdapter extends BaseAdapter {
private Context context;
@@ -53,14 +53,11 @@ public class ScanAdapter extends BaseAdapter {
viewHolder.infos_carname = view.findViewById(R.id.infos_carname);
viewHolder.infos_driver = view.findViewById(R.id.infos_driver);
viewHolder.infos_phone = view.findViewById(R.id.infos_phone);
- viewHolder.infos_batch = view.findViewById(R.id.infos_batch);
- viewHolder.infos_addrs = view.findViewById(R.id.infos_addrs);
- viewHolder.infos_time = view.findViewById(R.id.infos_time);
- viewHolder.infos_number = view.findViewById(R.id.infos_number);
- viewHolder.infos_immune = view.findViewById(R.id.infos_immune);
- viewHolder.infos_uniformity = view.findViewById(R.id.infos_uniformity);
- viewHolder.infos_startime = view.findViewById(R.id.infos_startime);
- viewHolder.infos_endtime = view.findViewById(R.id.infos_endtime);
+ viewHolder.infos_fuhuachang = view.findViewById(R.id.infos_fuhuachang);
+ viewHolder.infos_leavetime = view.findViewById(R.id.infos_leavetime);
+ viewHolder.infos_yangzhichang = view.findViewById(R.id.infos_yangzhichang);
+ viewHolder.infos_daodashijian = view.findViewById(R.id.infos_daodashijian);
+
view.setTag(viewHolder);
}else {
@@ -70,14 +67,11 @@ public class ScanAdapter extends BaseAdapter {
viewHolder.infos_carname.setText(message.getInfos_carname());
viewHolder.infos_driver.setText(message.getInfos_driver());
viewHolder.infos_phone.setText(message.getInfos_phone());
- viewHolder.infos_batch.setText(message.getInfos_batch());
- viewHolder.infos_addrs.setText(message.getInfos_addrs());
- viewHolder.infos_time.setText(message.getInfos_time());
- viewHolder.infos_number.setText(message.getInfos_number());
- viewHolder.infos_immune.setText(message.getInfos_immune());
- viewHolder.infos_uniformity.setText(message.getInfos_uniformity());
- viewHolder.infos_startime.setText(message.getInfos_startime());
- viewHolder.infos_endtime.setText(message.getInfos_endtime());
+ viewHolder.infos_fuhuachang.setText(message.getInfos_fuhuachang());
+ viewHolder.infos_leavetime.setText(message.getInfos_leavetime());
+ viewHolder.infos_yangzhichang.setText(message.getInfos_yangzhichang());
+ viewHolder.infos_daodashijian.setText(message.getInfos_daodashijian());
+
return view;
}
@@ -86,13 +80,9 @@ public class ScanAdapter extends BaseAdapter {
private TextView infos_carname;
private TextView infos_driver;
private TextView infos_phone;
- private TextView infos_batch;
- private TextView infos_addrs;
- private TextView infos_time;
- private TextView infos_number;
- private TextView infos_immune;
- private TextView infos_uniformity;
- private TextView infos_startime;
- private TextView infos_endtime;
+ private TextView infos_fuhuachang;
+ private TextView infos_leavetime;
+ private TextView infos_yangzhichang;
+ private TextView infos_daodashijian;
}
}
diff --git a/app/src/main/res/layout/item_infos.xml b/app/src/main/res/layout/item_infos.xml
index 302ad74..0a9f96e 100644
--- a/app/src/main/res/layout/item_infos.xml
+++ b/app/src/main/res/layout/item_infos.xml
@@ -27,6 +27,8 @@
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_maojiinfos.xml b/app/src/main/res/layout/item_maojiinfos.xml
new file mode 100644
index 0000000..d82e9b1
--- /dev/null
+++ b/app/src/main/res/layout/item_maojiinfos.xml
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file