生产日报重新布局

app/src/main/AndroidManifest.xml

@@ -106,6 +106,9 @@
         <activity
             android:name=".work.productiondailyw.ProductiondailywActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".work.productiondailyw.WdailyActivity"
+            android:screenOrientation="portrait" />
 
         <!-- 设置竖屏扫码 -->
         <activity

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

@@ -0,0 +1,103 @@
+package com.qhclh.ytzh.bean;
+
+import java.math.BigDecimal;
+
+/**
+ * Created by 青花瓷 on 2017/12/7.
+ */
+
+public class DailyDetailsBean {
+    private long House_ID;
+    private String House_Name;
+    private int Days;
+    private int DieNumber;
+    private int Obsolete;
+    private BigDecimal WaterIntake;
+    private BigDecimal Weight;
+    private String mingxi;
+
+    public String getMingxi() {
+        return mingxi;
+    }
+
+    public void setMingxi(String mingxi) {
+        this.mingxi = mingxi;
+    }
+
+    public DailyDetailsBean(long house_ID, String house_Name, int days, int dieNumber, int obsolete, BigDecimal waterIntake, BigDecimal weight, String mingxi) {
+        House_ID = house_ID;
+        House_Name = house_Name;
+        Days = days;
+        DieNumber = dieNumber;
+        Obsolete = obsolete;
+        WaterIntake = waterIntake;
+        Weight = weight;
+        this.mingxi = mingxi;
+    }
+
+    public DailyDetailsBean(long house_ID, String house_Name, int days, int dieNumber, int obsolete, BigDecimal waterIntake, BigDecimal weight) {
+        House_ID = house_ID;
+        House_Name = house_Name;
+        Days = days;
+        DieNumber = dieNumber;
+        Obsolete = obsolete;
+        WaterIntake = waterIntake;
+        Weight = weight;
+    }
+
+    public long getHouse_ID() {
+        return House_ID;
+    }
+
+    public void setHouse_ID(long house_ID) {
+        House_ID = house_ID;
+    }
+
+    public String getHouse_Name() {
+        return House_Name;
+    }
+
+    public void setHouse_Name(String house_Name) {
+        House_Name = house_Name;
+    }
+
+    public int getDays() {
+        return Days;
+    }
+
+    public void setDays(int days) {
+        Days = days;
+    }
+
+    public int getDieNumber() {
+        return DieNumber;
+    }
+
+    public void setDieNumber(int dieNumber) {
+        DieNumber = dieNumber;
+    }
+
+    public int getObsolete() {
+        return Obsolete;
+    }
+
+    public void setObsolete(int obsolete) {
+        Obsolete = obsolete;
+    }
+
+    public BigDecimal getWaterIntake() {
+        return WaterIntake;
+    }
+
+    public void setWaterIntake(BigDecimal waterIntake) {
+        WaterIntake = waterIntake;
+    }
+
+    public BigDecimal getWeight() {
+        return Weight;
+    }
+
+    public void setWeight(BigDecimal weight) {
+        Weight = weight;
+    }
+}

app/src/main/java/com/qhclh/ytzh/index/GetjpActivity.java

@@ -48,7 +48,9 @@ public class GetjpActivity extends BaseActivity{
             if(bundle!=null){
                 title = bundle.getString(JPushInterface.EXTRA_NOTIFICATION_TITLE);
                 content = bundle.getString(JPushInterface.EXTRA_ALERT);
+
             }
+            System.out.println("aaa++++++++"+bundle.getString(JPushInterface.EXTRA_EXTRA));
             tv_getjp.setText("Title : " + title + "  " + "Content : " + content);
             NewsBean newsBean =  new NewsBean();
             newsBean.setTitle(title);

app/src/main/java/com/qhclh/ytzh/index/MyBoradCReceiver.java

@@ -24,7 +24,7 @@ public class MyBoradCReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         try {
             Bundle bundle = intent.getExtras();
-//            Logger.d(TAG, "[MyReceiver] onReceive - " + intent.getAction() + ", extras: " + printBundle(bundle));
+//            Log.d(TAG, "[MyReceiver] onReceive - " + intent.getAction() + ", extras: " + printBundle(bundle));
 
             if (JPushInterface.ACTION_REGISTRATION_ID.equals(intent.getAction())) {
                 String regId = bundle.getString(JPushInterface.EXTRA_REGISTRATION_ID);

app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java

@@ -11,6 +11,7 @@ import com.qhclh.ytzh.work.breedpoultry.DatanalysisActivity;
 import com.qhclh.ytzh.work.carsmannage.CarsManageActivity;
 import com.qhclh.ytzh.work.productiondaily.ProductiondailyActivity;
 import com.qhclh.ytzh.work.productiondailyw.ProductiondailywActivity;
+import com.qhclh.ytzh.work.productiondailyw.WdailyActivity;
 import com.qhclh.ytzh.work.scan.ScanResultActivity;
 import com.qhclh.ytzh.work.tablepoultry.TablepoultryActivity;
 import com.youth.banner.Banner;
@@ -116,7 +117,8 @@ public class WorkFragment extends BaseFragment implements View.OnClickListener {
         }else if (view.equals(ll_productdaily)){
             startActivity(new Intent(getActivity(), ProductiondailyActivity.class));
         }else if (view.equals(ll_productdaily_w)){
-            startActivity(new Intent(getActivity(), ProductiondailywActivity.class));
+//            startActivity(new Intent(getActivity(), ProductiondailywActivity.class));
+            startActivity(new Intent(getActivity(), WdailyActivity.class));
         }
     }
 

app/src/main/java/com/qhclh/ytzh/work/productiondailyw/DailyDetailsAdapter.java

@@ -0,0 +1,86 @@
+package com.qhclh.ytzh.work.productiondailyw;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.bean.DailyDetailsBean;
+
+import java.util.List;
+
+/**
+ * Created by 青花瓷 on 2017/12/7.
+ */
+
+public class DailyDetailsAdapter extends BaseAdapter {
+    private Context context;
+    private List<DailyDetailsBean> list;
+    private LayoutInflater layoutInflater;
+
+    public DailyDetailsAdapter(Context context, List<DailyDetailsBean> list) {
+        this.context = context;
+        this.list = list;
+        layoutInflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public int getCount() {
+        return list.size();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return list.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return list.get(i).getHouse_ID();
+    }
+
+    @Override
+    public View getView(int i, View view, ViewGroup viewGroup) {
+        ViewHolder viewHolder;
+        DailyDetailsBean message = list.get(i);
+        if (view == null){
+            view = layoutInflater.inflate(R.layout.item_dailydetail,viewGroup,false);
+            viewHolder = new ViewHolder();
+            viewHolder.dailyd_title = view.findViewById(R.id.dailyd_title);
+            viewHolder.dailyd_buildinghome = view.findViewById(R.id.dailyd_buildinghome);
+            viewHolder.dailyd_dayage = view.findViewById(R.id.dailyd_dayage);
+            viewHolder.dailyd_death = view.findViewById(R.id.dailyd_death);
+            viewHolder.dailyd_eliminate = view.findViewById(R.id.dailyd_eliminate);
+            viewHolder.dailyd_water = view.findViewById(R.id.dailyd_water);
+            viewHolder.dailyd_weight = view.findViewById(R.id.dailyd_weight);
+
+            view.setTag(viewHolder);
+        }else {
+            viewHolder = (ViewHolder) view.getTag();
+        }
+
+        viewHolder.dailyd_title.setText(message.getMingxi()+"");
+        viewHolder.dailyd_buildinghome.setText(message.getHouse_Name()+"");
+        viewHolder.dailyd_dayage.setText(message.getDays()+"");
+        viewHolder.dailyd_death.setText(message.getDieNumber()+"");
+        viewHolder.dailyd_eliminate.setText(message.getObsolete()+"");
+        viewHolder.dailyd_water.setText(message.getWaterIntake()+"");
+        viewHolder.dailyd_weight.setText(message.getWeight()+"");
+
+        return view;
+    }
+
+    private class ViewHolder{
+        private TextView dailyd_title;
+        private TextView dailyd_buildinghome;
+        private EditText dailyd_dayage;
+        private EditText dailyd_death;
+        private EditText dailyd_eliminate;
+        private EditText dailyd_water;
+        private EditText dailyd_weight;
+    }
+}

app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WdailyActivity.java

@@ -0,0 +1,90 @@
+package com.qhclh.ytzh.work.productiondailyw;
+
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.Spinner;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.base.BaseActivity;
+import com.qhclh.ytzh.bean.DailyDetailsBean;
+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.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+/**
+ * Created by 青花瓷 on 2017/12/7.
+ */
+///< 重新写 生产日报
+public class WdailyActivity extends BaseActivity {
+    @BindView(R.id.toolbar)
+    Toolbar mToolbar;
+    @BindView(R.id.wdaily_lv)
+    ListView wdaily_lv;
+
+    private List<DailyDetailsBean> list;
+    private DailyDetailsAdapter adapter;
+
+    @Override
+    protected int setLayoutId() {
+        return R.layout.act_wproductiondaily;
+    }
+
+    @Override
+    protected void initView() {
+        initToolbar(mToolbar, "生产日报", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected void initData() {
+        list=new ArrayList<>();
+        for (int i=0;i<5;i++){
+            list.add(new DailyDetailsBean(i,"aaa1"+i,i+1,i+2,i+3,new BigDecimal(i+4),new BigDecimal(i+5),"单据明细"+i));
+        }
+        adapter = new DailyDetailsAdapter(this,list);
+        wdaily_lv.setAdapter(adapter);
+    }
+
+    @Override
+    protected void initOper() {
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.commit, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.commit_dailys:
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/greyf4f4f4"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_tool_bar" />
+
+    <ListView
+        android:id="@+id/wdaily_lv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:scrollbars="none">
+
+    </ListView>
+
+
+</LinearLayout>

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

@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/greyf4f4f4"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/dailyd_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/text_size_16" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/buildinghomes1"
+            android:textColor="@color/grey888888"
+            android:textSize="@dimen/text_size_18" />
+
+        <TextView
+            android:id="@+id/dailyd_buildinghome"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20" />
+    </LinearLayout>
+
+    <include layout="@layout/include_line" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dayage1"
+            android:textColor="@color/grey888888"
+            android:textSize="@dimen/text_size_18" />
+
+        <EditText
+            android:id="@+id/dailyd_dayage"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20" />
+    </LinearLayout>
+
+    <include layout="@layout/include_line" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/survival"
+            android:textColor="@color/grey888888"
+            android:textSize="@dimen/text_size_18" />
+
+        <TextView
+            android:id="@+id/production_info_survival"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20" />
+    </LinearLayout>
+
+    <include layout="@layout/include_line" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/death1"
+            android:textColor="@color/grey888888"
+            android:textSize="@dimen/text_size_18" />
+
+        <EditText
+            android:id="@+id/dailyd_death"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20" />
+    </LinearLayout>
+
+    <include layout="@layout/include_line" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/eliminate"
+            android:textColor="@color/grey888888"
+            android:textSize="@dimen/text_size_18" />
+
+        <EditText
+            android:id="@+id/dailyd_eliminate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20" />
+    </LinearLayout>
+
+    <include layout="@layout/include_line" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/water"
+            android:textColor="@color/grey888888"
+            android:textSize="@dimen/text_size_18" />
+
+        <EditText
+            android:id="@+id/dailyd_water"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20" />
+    </LinearLayout>
+
+    <include layout="@layout/include_line" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/weight1"
+            android:textColor="@color/grey888888"
+            android:textSize="@dimen/text_size_18" />
+
+        <EditText
+            android:id="@+id/dailyd_weight"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20" />
+    </LinearLayout>
+
+    <include layout="@layout/include_line" />
+
+</LinearLayout>

app/src/main/res/menu/commit.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/commit_dailys"
+        android:title="@string/commit"
+        android:orderInCategory="70"
+        app:showAsAction="always" />
+</menu>