需求单No.147692 需求单No.148100

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

.idea/misc.xml

@@ -1,43 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="10">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="9">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (3)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -5,6 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/Ytzh_Android.iml" filepath="$PROJECT_DIR$/Ytzh_Android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/jsonrpc/jsonrpc.iml" filepath="$PROJECT_DIR$/jsonrpc/jsonrpc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ytzh_Android_ZhongHui.iml" filepath="$PROJECT_DIR$/ytzh_Android_ZhongHui.iml" />
       <module fileurl="file://$PROJECT_DIR$/ytzh_project.iml" filepath="$PROJECT_DIR$/ytzh_project.iml" />
     </modules>
   </component>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

app/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.4.8"
+        versionName "1.4.9"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         ndk {

app/bwpsoft.jks.txt

@@ -0,0 +1,4 @@
+RELEASE_KEY_FILE=bwpsoft.jks（见附件）
+RELEASE_KEY_PASSWORD=bwpsoft.jks
+RELEASE_KEY_ALIAS=bwpsoft
+RELEASE_STORE_PASSWORD=bwpsoft.jks

app/src/main/java/com/qhclh/ytzh/bean/ReportBean.java

@@ -13,6 +13,7 @@ public class ReportBean {
     private String item_weight;
     private String dongshe;
     private String chenghuolv;
+    private String biologicalAssetName;
 
     public String getChenghuolv() {
         return chenghuolv;
@@ -22,7 +23,7 @@ public class ReportBean {
         this.chenghuolv = chenghuolv;
     }
 
-    public ReportBean(long id, String item_dayage, String item_death, String item_eliminatee, String item_water, String item_weight, String dongshe, String chenghuolv) {
+    public ReportBean(long id, String item_dayage, String item_death, String item_eliminatee, String item_water, String item_weight, String dongshe, String chenghuolv,String mbiologicalAssetName) {
         this.id = id;
         this.item_dayage = item_dayage;
         this.item_death = item_death;
@@ -31,6 +32,7 @@ public class ReportBean {
         this.item_weight = item_weight;
         this.dongshe = dongshe;
         this.chenghuolv = chenghuolv;
+        this.biologicalAssetName=mbiologicalAssetName;
     }
 
     public ReportBean(long id, String item_dayage, String item_death, String item_eliminatee, String item_water, String item_weight, String dongshe) {
@@ -51,6 +53,15 @@ public class ReportBean {
         this.dongshe = dongshe;
     }
 
+
+    public String getBiologicalAssetName() {
+        return biologicalAssetName;
+    }
+
+    public void setBiologicalAssetName(String mbiologicalAssetName) {
+        this.biologicalAssetName = mbiologicalAssetName;
+    }
+
     public long getId() {
         return id;
     }

app/src/main/java/com/qhclh/ytzh/work/tablepoultry/LvReportInfoAdapter.java

@@ -56,6 +56,7 @@ public class LvReportInfoAdapter extends BaseAdapter {
             holder.ll_buildhouseinfo =  convertView.findViewById(R.id.ll_buildhouseinfo);
             holder.item_dongshe =  convertView.findViewById(R.id.item_dongshe);
             holder.item_chenghuolv =  convertView.findViewById(R.id.item_chenghuolv);
+            holder.item_biologicalAssetName =  convertView.findViewById(R.id.item_biologicalAssetName);
 
 
             convertView.setTag(holder);
@@ -72,6 +73,7 @@ public class LvReportInfoAdapter extends BaseAdapter {
 
         holder.item_dongshe.setText(message.getDongshe());
         holder.item_chenghuolv.setText(message.getChenghuolv());
+        holder.item_biologicalAssetName.setText(message.getBiologicalAssetName());
 
         if (position%2==0){
             holder.ll_buildhouseinfo.setBackgroundColor(context.getResources().getColor(R.color.greyf4f4f4));
@@ -89,6 +91,7 @@ public class LvReportInfoAdapter extends BaseAdapter {
         TextView item_weight;
         TextView item_dongshe;
         TextView item_chenghuolv;
+        TextView item_biologicalAssetName;
         LinearLayout ll_buildhouseinfo;
     }
 }

app/src/main/java/com/qhclh/ytzh/work/tablepoultry/ReportActivity.java

@@ -2,12 +2,16 @@ package com.qhclh.ytzh.work.tablepoultry;
 
 import android.content.Intent;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.HorizontalScrollView;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.qhclh.ytzh.R;
 import com.qhclh.ytzh.base.BaseActivity;
@@ -15,6 +19,7 @@ import com.qhclh.ytzh.bean.ReportBean;
 import com.qhclh.ytzh.bean.ReportString;
 import com.qhclh.ytzh.home.RpcUrl;
 import com.qhclh.ytzh.tasks.ViewOnClickTask;
+import com.qhclh.ytzh.ui.CalendarDialogFragment;
 import com.qhclh.ytzh.ui.LinkedHorizontalScrollView;
 import com.qhclh.ytzh.ui.NoScrollHorizontalScrollView;
 import com.qhclh.ytzh.utils.DateTimeUtil;
@@ -23,6 +28,9 @@ import com.qhclh.ytzh.work.breedpoultry.DatanalysisActivity;
 import org.forks.jsonrpc.JsonRpcResult;
 import org.forks.jsonrpc.RpcFacade;
 import org.forks.jsonrpc.RpcObject;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -36,9 +44,13 @@ import butterknife.BindView;
  * Created by 青花瓷 on 2017/12/12.
  */
 
-public class ReportActivity extends BaseActivity {
+public class ReportActivity extends BaseActivity implements CalendarDialogFragment.CalendarClickListener{
     @BindView(R.id.toolbar)
     Toolbar mToolbar;
+
+    @BindView(R.id.tv_toolbar_title)
+    TextView tv_toolbar_title;
+
     @BindView(R.id.sv_title)
     NoScrollHorizontalScrollView sv_title;//不可滑动的顶部左侧的ScrollView
     @BindView(R.id.sv_report_detail)
@@ -70,7 +82,7 @@ public class ReportActivity extends BaseActivity {
                 finish();
             }
         });
-
+        tv_toolbar_title.setText("报表指数");
         combination(lv_buildhousename, lv_report_info, sv_title, sv_report_detail);
     }
 
@@ -84,6 +96,46 @@ public class ReportActivity extends BaseActivity {
         reportBeanList = new ArrayList<>();
 
     }
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.search, menu);
+        menu.findItem(R.id.search_addr).setVisible(true);
+        return true;
+    }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.search_addr:
+                new CalendarDialogFragment().show(getSupportFragmentManager(), "start");
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onStartCalendarClick(Date date) {
+//        GetAllWeatherAreas(date.getTime());
+        time=date.getTime();
+        DetailListView();
+//        flag = true;
+
+        tv_toolbar_title.setText(DateTimeUtil.getYMD2(date));
+        EventBus.getDefault().postSticky(new ChoseEvent(date.getTime()));
+    }
+
+    @Override
+    public void onEndCalendarClick(Date date) {
+
+    }
+
+
+
+//    @Subscribe(threadMode = ThreadMode.MAIN,sticky = true)
+//    public void onEvent(ChoseEvent event){
+//        time = event.getTime();
+//        Log.d("a",String.valueOf(time));
+//        DetailListView();
+//    }
 
     @Override
     protected void onResume() {
@@ -135,13 +187,21 @@ public class ReportActivity extends BaseActivity {
                     if (rpc.get(i).getDecimal("LiveRate")!=null){
                         chunhuolv = rpc.get(i).getDecimal("LiveRate").multiply(new BigDecimal("100")).stripTrailingZeros().toPlainString() + "%";
                     }
+                    String biologicalAssetName = "";
+                    if (rpc.get(i).getString("BiologicalAsset_Name")!=null){
+                        biologicalAssetName = rpc.get(i).getString("BiologicalAsset_Name")+"";
+                    }
                     reportBeanList.add(new ReportBean(rpc.get(i).getLong("ID")
                             ,days
                             ,dies
                             ,obs
                             ,water
                             ,weight
-                            ,rpc.get(i).getString("House_Name"),chunhuolv));
+                            ,rpc.get(i).getString("House_Name")
+                            ,chunhuolv
+                            ,biologicalAssetName
+                            )
+                    );
                 }
 
                 lvBuildhousenaneAdapter = new LvBuildhousenaneAdapter(ReportActivity.this,buildhouseList);

app/src/main/res/layout/act_report.xml

@@ -73,6 +73,15 @@
                     android:textColor="@color/grey666666"
                     android:textSize="16sp" />
 
+                <TextView
+                    android:layout_width="80dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center"
+                    android:text="鸡苗来源"
+                    android:textColor="@color/grey666666"
+                    android:textSize="16sp" />
+
                 <TextView
                     android:layout_width="80dp"
                     android:layout_height="wrap_content"
@@ -109,6 +118,7 @@
                     android:textColor="@color/grey666666"
                     android:textSize="16sp" />
 
+
             </LinearLayout>
         </com.qhclh.ytzh.ui.NoScrollHorizontalScrollView>
 

app/src/main/res/layout/item_lv_buildhouse_info.xml

@@ -35,6 +35,16 @@
         android:textColor="@color/black303030"
         android:textSize="@dimen/text_size_14" />
 
+    <TextView
+        android:id="@+id/item_biologicalAssetName"
+        android:layout_width="80dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:text="鸡苗来源"
+        android:textColor="@color/black303030"
+        android:textSize="@dimen/text_size_14" />
+
     <TextView
         android:id="@+id/item_death"
         android:layout_width="80dp"
@@ -74,4 +84,6 @@
         android:text="@string/weight"
         android:textColor="@color/black303030"
         android:textSize="@dimen/text_size_14" />
+
+
 </LinearLayout>