From 84116c3a0a398a8a38f2dc723b5c53f9c35704e7 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Tue, 5 Dec 2017 13:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=81=E5=85=89apk?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=20=EF=BC=8C=E7=94=9F=E4=BA=A7=E6=97=A5?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=9C=9F=E5=AE=9E=E6=95=B0=E6=8D=AE=E5=A1=AB?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              |  2 +-
 .../qhclh/ytzh/bean/ProductionDailyBean.java  |  8 ++---
 .../com/qhclh/ytzh/home/MyApplication.java    |  6 ++--
 .../main/java/com/qhclh/ytzh/home/RpcUrl.java |  4 +--
 .../ProductiondailyActivity.java              | 32 +++++++++++++------
 .../ProductiondailyAdapter.java               |  6 ++--
 7 files changed, 37 insertions(+), 23 deletions(-)

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 @@
         <!-- 发到其他市场的 APK 可以设置为 xxx-market。 -->
         <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
         <!-- Required. AppKey copied from Portal -->
-        <meta-data android:name="JPUSH_APPKEY" android:value="53d7a345ed1d408462447820"/>
+        <meta-data android:name="JPUSH_APPKEY" android:value="2825a92d76c57b701e2d8308"/>
 
         <activity android:name=".index.TestActivity"/>
     </application>
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<String> setTags = new LinkedHashSet<>();
-        setTags.add("aaa");
-        JPushInterface.setTags(this,0,setTags);
+//        Set<String> 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<ProductionDailyBean> productionDailyBeanList;
+    private List<ProductionDailyBean> 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<size;i++){
+                    productionDailyBeanList.add(new ProductionDailyBean(rpcobj.get(i).getLong("ID")
+                            ,rpcobj.get(i).getString("Batch_Name"),rpcobj.get(i).getString("BreedFactory_Name")
+                            ,DateTimeUtil.getYMD2(rpcobj.get(i).getDate("Date"))));
+                }
+                productiondailyAdapter = new ProductiondailyAdapter(ProductiondailyActivity.this,productionDailyBeanList);
+                lv_productiondaily.setAdapter(productiondailyAdapter);
             }
 
             @Override
@@ -143,7 +147,7 @@ public class ProductiondailyActivity extends BaseActivity implements CalendarDia
 //                orderBy1.setString("Name", "CreateTime");
 //                orderBy1.setBoolean("Desc", true);
 //                orderList.add(orderBy1);
-                JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.DayProductRpc_Query);
+                JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.DayProductRpc_Query,queryObj);
                 rpcobj = result.getRpcObjectList(RpcUrl.DayProductRpc_Query_fanhui);
                 return null;
             }
@@ -193,4 +197,14 @@ public class ProductiondailyActivity extends BaseActivity implements CalendarDia
     public void onRefresh() {
         rfl_productiondaily.setRefreshing(false);
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        page =0;
+        if (productionDailyBeanList!=null){
+            productionDailyBeanList.clear();
+            productionDailyBeanList = null;
+        }
+    }
 }
diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyAdapter.java b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyAdapter.java
index be4cee0..6858d3a 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyAdapter.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyAdapter.java
@@ -60,9 +60,9 @@ public class ProductiondailyAdapter extends BaseAdapter {
             viewHolder = (ViewHolder) view.getTag();
         }
 
-        viewHolder.productiondaily_batch.setText(message.getProductionbatch());
-        viewHolder.productiondaily_addrs.setText(message.getProductionaddrs());
-        viewHolder.productiondaily_time.setText(message.getPtime());
+        viewHolder.productiondaily_batch.setText("批次:"+message.getProductionbatch());
+        viewHolder.productiondaily_addrs.setText("养殖场:"+message.getProductionaddrs());
+        viewHolder.productiondaily_time.setText("日期:"+message.getPtime());
 
         return view;
     }