diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..5e744e6 Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000..663d437 Binary files /dev/null and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0df5560..f548d92 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,43 +1,41 @@ - - - - - - - - - - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 0e4eb55..58ef802 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -5,6 +5,7 @@ + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/app-release.apk b/app/app-release.apk new file mode 100644 index 0000000..cbda7c1 Binary files /dev/null and b/app/app-release.apk differ diff --git a/app/build.gradle b/app/build.gradle index aa9a413..224ca01 100644 --- a/app/build.gradle +++ b/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 { diff --git a/app/bwpsoft.jks.txt b/app/bwpsoft.jks.txt new file mode 100644 index 0000000..6d25c86 --- /dev/null +++ b/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 diff --git a/app/src/main/java/com/qhclh/ytzh/bean/ReportBean.java b/app/src/main/java/com/qhclh/ytzh/bean/ReportBean.java index 091b794..f6bf38a 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/ReportBean.java +++ b/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; } diff --git a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/LvReportInfoAdapter.java b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/LvReportInfoAdapter.java index 8364a36..9ad941b 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/LvReportInfoAdapter.java +++ b/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; } } diff --git a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/ReportActivity.java b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/ReportActivity.java index 0c93a3b..83c9511 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/ReportActivity.java +++ b/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); diff --git a/app/src/main/res/layout/act_report.xml b/app/src/main/res/layout/act_report.xml index 061b9c2..64a854b 100644 --- a/app/src/main/res/layout/act_report.xml +++ b/app/src/main/res/layout/act_report.xml @@ -73,6 +73,15 @@ android:textColor="@color/grey666666" android:textSize="16sp" /> + + + diff --git a/app/src/main/res/layout/item_lv_buildhouse_info.xml b/app/src/main/res/layout/item_lv_buildhouse_info.xml index 92b715c..de2cd9e 100644 --- a/app/src/main/res/layout/item_lv_buildhouse_info.xml +++ b/app/src/main/res/layout/item_lv_buildhouse_info.xml @@ -35,6 +35,16 @@ android:textColor="@color/black303030" android:textSize="@dimen/text_size_14" /> + + + + \ No newline at end of file