diff --git a/app/build.gradle b/app/build.gradle index dab57f5..c7ecb22 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ android { manifestPlaceholders = [ JPUSH_PKGNAME : applicationId, - JPUSH_APPKEY : "53d7a345ed1d408462447820", //JPush上注册的包名对应的appkey. + JPUSH_APPKEY : "2825a92d76c57b701e2d8308", //JPush上注册的包名对应的appkey. JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可. ] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fd23194..b9c48eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -253,7 +253,7 @@ - + diff --git a/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyBean.java b/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyBean.java index d8a6dc5..c57bd84 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyBean.java +++ b/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyBean.java @@ -5,23 +5,23 @@ package com.qhclh.ytzh.bean; */ public class ProductionDailyBean { - private int id; + private long id; private String productionbatch; private String productionaddrs; private String ptime; - public ProductionDailyBean(int id, String productionbatch, String productionaddrs, String ptime) { + public ProductionDailyBean(long id, String productionbatch, String productionaddrs, String ptime) { this.id = id; this.productionbatch = productionbatch; this.productionaddrs = productionaddrs; this.ptime = ptime; } - public int getId() { + public long getId() { return id; } - public void setId(int id) { + public void setId(long id) { this.id = id; } diff --git a/app/src/main/java/com/qhclh/ytzh/home/MyApplication.java b/app/src/main/java/com/qhclh/ytzh/home/MyApplication.java index c62c2c5..76effc0 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/MyApplication.java +++ b/app/src/main/java/com/qhclh/ytzh/home/MyApplication.java @@ -52,9 +52,9 @@ public class MyApplication extends LitePalApplication { JPushInterface.setDebugMode(true); JPushInterface.init(this); - Set setTags = new LinkedHashSet<>(); - setTags.add("aaa"); - JPushInterface.setTags(this,0,setTags); +// Set setTags = new LinkedHashSet<>(); +// setTags.add("aaa"); +// JPushInterface.setTags(this,0,setTags); } public void exit() { diff --git a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java index 5343002..f77a699 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java +++ b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java @@ -10,8 +10,8 @@ public class RpcUrl { public static String BaseAppUrl = "http://221.1.97.114:86/B3/"; public static String DayProductRpc_Query = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/Query"; - public static String DayProductRpc_Query_canshu = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/Query"; - public static String DayProductRpc_Query_fanhui = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/Query"; + public static String DayProductRpc_Query_canshu = "/MainSystem/B3UnitedInfos/Rpcs/RpcQueryObj"; + public static String DayProductRpc_Query_fanhui = "/MainSystem/B3PoultryBreed/BO/DayProduct"; public static String DayProductRpc_New = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/New"; public static String DayProductRpc_Insert = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/Insert"; diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyActivity.java b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyActivity.java index c15cfab..a74e928 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyActivity.java @@ -41,7 +41,7 @@ public class ProductiondailyActivity extends BaseActivity implements CalendarDia @BindView(R.id.rfl_productiondaily) RefreshLayout rfl_productiondaily; private int page =0; - private List productionDailyBeanList; + private List productionDailyBeanList = null; private ProductiondailyAdapter productiondailyAdapter; @Override protected int setLayoutId() { @@ -62,11 +62,7 @@ public class ProductiondailyActivity extends BaseActivity implements CalendarDia @Override protected void initData() { productionDailyBeanList = new ArrayList<>(); - for (int i=0;i<10;i++){ - productionDailyBeanList.add(new ProductionDailyBean(i+2,"1"+i,"adfa0"+i,"adfagfaw"+i)); - } - productiondailyAdapter = new ProductiondailyAdapter(this,productionDailyBeanList); - lv_productiondaily.setAdapter(productiondailyAdapter); + } @Override @@ -84,7 +80,7 @@ public class ProductiondailyActivity extends BaseActivity implements CalendarDia @Override protected void onResume() { super.onResume(); - DayProductRpcNew(); +// DayProductRpcNew(); DayProductRpcQuery(); } @@ -114,7 +110,15 @@ public class ProductiondailyActivity extends BaseActivity implements CalendarDia @Override protected void successUI() { - + int size = rpcobj.size(); + productionDailyBeanList.clear(); + for (int i=0;i