From 3e0cde81166e2fa5a4523f9f40b5dee046755cbc Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Mon, 4 Dec 2017 14:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=BB=E6=B7=98=20=E5=92=8C=E6=B7=98?=
 =?UTF-8?q?=E6=B1=B0=E4=B8=8D=E4=B8=80=E6=A0=B7=20=20=EF=BC=8C=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E6=97=A5=E6=8A=A5=E8=A1=A8=E4=BF=A1=E6=81=AF=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable-xhdpi/clock.png     | Bin 0 -> 1813 bytes
 app/src/main/res/layout/act_datanaly_s.xml    |   2 +-
 app/src/main/res/layout/act_datanalysis.xml   |   2 +-
 .../res/layout/act_productiondaily_info.xml   | 314 +++++++++++++++++-
 app/src/main/res/menu/chosetime.xml           |   2 +-
 app/src/main/res/menu/save.xml                |   8 +
 app/src/main/res/values/strings.xml           |  11 +
 app/src/main/res/values/styles.xml            |   2 +-
 8 files changed, 333 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/clock.png
 create mode 100644 app/src/main/res/menu/save.xml

diff --git a/app/src/main/res/drawable-xhdpi/clock.png b/app/src/main/res/drawable-xhdpi/clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2df403737907ae402c0e3a5ede732ba85bc0458
GIT binary patch
literal 1813
zcmaJ?c~BE)9F1}bDpjCGyjTJvSaOm88wn7S08xSvqJWko#|EM#8?vhjRJl~9RZvk;
zLE5TBP!#Y0YEcYWK|~Q4R75=RnpV_e4c-UcAYlI}-I?9*nD^fA_}(}BV|ZBbRI8a*
zI2>*&FN7n&Mo;5A$sGGK_LCQ2g9FNqMk8Svsu8In97_s|A%Le4B|-v7Bu!1Z2>If0
zCa!W}G#bqhWk_HJQDnprwF(u+#^HSZwJMQh6@&s}C{eCt;s;La@qk>)#7EKjWWI_G
zCCNk5)KFwvm{5|oN&-sp{(gY3mVpT<AXEfs70F73p=IKSbs5;)xJ|+X!w_^86aP7>
zXnr`rhSd;2CwdVi6i*+(8zfTbpbwSi0Z_>lFA^CfQD_7*g+T@xWC}3y;IU|Gsf;1u
z1dYVPR!n>nimDhSl18H;YCMUsI*~*HL6AhIlBiSyh9DrRN>rpJC=usT1rCHr)N&On
zhn0X)Q6z>}qf9)O>E{v@sxet5GSVijVI-|cMWPVN#*#*XeE$DK6^b!5f(oE7`TnOc
zB1~05BmsoLtJM<h;AGCmP$~vn4T(@#Erj9Z(JqE3!6=L*!76~wHg?S$aEp>FrLYEZ
zALj7+44x7}MM??8<1q1<3Q;bXG6Gp_I-O0Sb9@5n6bjcH<Z!s4Ck<q?IJ6)y(0i22
zfhDUIkP;o`O22Tu#^oCApip6vIgnbu29gG;VFfT;HbXvsE}rA+jc}#o=RzBoOTv;N
z84veghdsK5ImkF2vo5w6Ge4xn9IwW#9aL6Lz;4V&9)~5=-h5cZ42_JiyKw2*?ubPW
zMYx4d)FeS-!&3V|moV2kPw)5j0j%GfvrE=ndN7X7Fy~9%l;)ycjWcb|^#xg2?ECt>
z>64+NuF|;n`uc(T_YW7$f4fmPkY4Qn`gRo(x8!6`sLu)C85WWRyWC8tj>+5m>}U;h
zZ%pV-uuaZ1v9})N*zGXs+Gkp6GW|fFW5OJd^-=rg-kjy`YHIe}^r`pln|?JbCOwGi
zu#%Ha`rEV>VIOr5Y!EZy-i+?@t5pSCYmw3^KW9yjZCz(JU<o#A8lBoqK>fQ0GGUtS
z`GZ77y2<NC!yzPSQ|z%fUsY!H0+*^O)^j`JU&id}uZS5u9`I>HTAQ?~i8x0X(Am*^
zRFHl>yf)-nVRENSi%T;NPbWi^@~H>oN_sPP->g{eus=ZDn$vtIi?!LZr|R%sI6|}S
zU1v<svfS^OTj+U5GjkvH+i*j(-^FxRr(CX3-|`dCC-KaqTT3?a!ZW_jffg!kJSEy1
z>ICm-d+~B--S>}VsMxCLr+OI}eBY+4h)r+f?O!+e*ms7X&bD&p>i|MZ?J{S7;gfm#
zj9wa2#For^$h!KnrTS2kb=hxM@(WAf|F9CV)F+1_TepAuwQ1*`K)7*NqPVt&bZrrV
zl3Evi_!a(MSxP!@$dFxGmkoZbOj{r;`0%7Uo?&{sXX%dMH?~WfinnEy=ULXRP>I)i
zUD0>iaU+DiTRQX4a0}U1=%2X;*oAu!xVA=OXXrVQdnVS;Y%9GT9Lm`s>-P73&>a%j
z?wGYAC;$Be8sHXCw)}P$`|h0T6ux2MAMt{4UH;_1xHZntDdJg<QyPP>g_&&(UHSwW
zth;6D9&)A7?D=v-v7svez>TW9b1kZl`4(c`wj+J`7SluB3i>Qrdhg<hY41<e$<}*Y
z&mWwAuk}=YN^sKkr<U#B{406|OKw)Fx*q8iledS@dOQ8)$DK}Hyd_PcRHxX-Lpl36
z?TpCBm1SZdy>7^&qGX5~*=O#S=Bf)xKU_OoGX=0dD#pFg9y{-L*0R*sp}_q`aLvJ2
zf4erHDqKAALfhHQ)S$OGt%J%!BX{V}$V~NGl78}{>+a(+d(I~M>B|#2^VHuoK<Tdi
zvs1SJl2QOp-fXyBc%)c1P2480YxUZzDpL4G-JS3uGCrxe7fw7gRQ_21?v6+K40_Jm
e()fv=>=JN}vtM`K7aN`$e^fkf7^gBYA^RV()y&fX

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/act_datanaly_s.xml b/app/src/main/res/layout/act_datanaly_s.xml
index 5e34e9d..4b5c8a4 100644
--- a/app/src/main/res/layout/act_datanaly_s.xml
+++ b/app/src/main/res/layout/act_datanaly_s.xml
@@ -140,7 +140,7 @@
                     android:button="@null"
                     android:gravity="center_horizontal"
                     android:padding="@dimen/dp_3"
-                    android:text="@string/Death"
+                    android:text="@string/eliminatee"
                     android:textColor="@color/black303030"
                     android:textSize="@dimen/text_size_18" />
 
diff --git a/app/src/main/res/layout/act_datanalysis.xml b/app/src/main/res/layout/act_datanalysis.xml
index e63bd6e..37ebd16 100644
--- a/app/src/main/res/layout/act_datanalysis.xml
+++ b/app/src/main/res/layout/act_datanalysis.xml
@@ -80,7 +80,7 @@
             android:layout_weight="2"
             android:drawableLeft="@drawable/shape_perpo"
             android:drawablePadding="@dimen/dp_5"
-            android:text="@string/Death"
+            android:text="@string/eliminatee"
             android:textColor="@color/grey888888"
             android:textSize="@dimen/text_size_14" />
 
diff --git a/app/src/main/res/layout/act_productiondaily_info.xml b/app/src/main/res/layout/act_productiondaily_info.xml
index 25eb1ab..93499f6 100644
--- a/app/src/main/res/layout/act_productiondaily_info.xml
+++ b/app/src/main/res/layout/act_productiondaily_info.xml
@@ -1,11 +1,317 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:background="@color/greyf4f4f4"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/greyf4f4f4"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_tool_bar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="none">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/dp_5"
+                android:text="@string/Basicattributes"
+                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/batch"
+                    android:textColor="@color/grey888888"
+                    android:textSize="@dimen/text_size_18" />
+
+                <TextView
+                    android:id="@+id/production_info_batch"
+                    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/farm1"
+                    android:textColor="@color/grey888888"
+                    android:textSize="@dimen/text_size_18" />
+
+                <TextView
+                    android:id="@+id/production_info_farm"
+                    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/Accountingunit"
+                    android:textColor="@color/grey888888"
+                    android:textSize="@dimen/text_size_18" />
+
+                <TextView
+                    android:id="@+id/production_info_account"
+                    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/date"
+                    android:textColor="@color/grey888888"
+                    android:textSize="@dimen/text_size_18" />
+
+                <TextView
+                    android:id="@+id/production_info_date"
+                    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" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/dp_5"
+                android:text="@string/Detailsofdocuments"
+                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/production_info_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" />
+
+                <TextView
+                    android:id="@+id/production_info_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">
+
+                <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" />
+
+                <TextView
+                    android:id="@+id/production_info_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" />
+
+                <TextView
+                    android:id="@+id/production_info_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" />
+
+                <TextView
+                    android:id="@+id/production_info_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" />
 
-    <include layout="@layout/include_tool_bar"/>
+                <TextView
+                    android:id="@+id/production_info_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" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_20" />
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/chosetime.xml b/app/src/main/res/menu/chosetime.xml
index 916e963..4499e94 100644
--- a/app/src/main/res/menu/chosetime.xml
+++ b/app/src/main/res/menu/chosetime.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/chose_time"
         android:title="@string/chosedate"
-        android:icon="@drawable/riqi_3x"
+        android:icon="@drawable/clock"
         android:orderInCategory="70"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/save.xml b/app/src/main/res/menu/save.xml
new file mode 100644
index 0000000..8d37015
--- /dev/null
+++ b/app/src/main/res/menu/save.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/save_info"
+        android:title="@string/save"
+        android:orderInCategory="70"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd6ab67..dfa772c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,20 +39,25 @@
     <string name="standard">标准</string>
     <string name="tostandard">和标准对比</string>
     <string name="death">死亡</string>
+    <string name="death1">死亡:</string>
     <string name="weight">体重</string>
+    <string name="weight1">体重:</string>
     <string name="Death">死淘</string>
     <string name="Contrastiveterm">对比项</string>
     <string name="showcontents">显示内容</string>
     <string name="Farm">养殖场</string>
+    <string name="farm1">养殖场:</string>
     <string name="target">指标</string>
     <string name="age">龄段</string>
     <string name="monage">周龄</string>
     <string name="dayage">日龄</string>
+    <string name="dayage1">日龄:</string>
     <string name="Deathofmalemother">公母死亡</string>
     <string name="Deathofmale">公死亡数</string>
     <string name="Deathofemale">母死亡数</string>
     <string name="condition">条件</string>
     <string name="Buildinghomes">栋舍</string>
+    <string name="buildinghomes1">栋舍:</string>
     <string name="changle">昌乐</string>
     <string name="shouguangdong">寿光东</string>
     <string name="shouguangxi">寿光西</string>
@@ -62,5 +67,11 @@
     <string name="Productiondaily_w">生产日报</string>
     <string name="Basicattributes">基本属性</string>
     <string name="Detailsofdocuments">单据明细</string>
+    <string name="save">保存</string>
+    <string name="Accountingunit">会计单位:</string>
+    <string name="survival">存活率:</string>
+    <string name="eliminate">淘汰:</string>
+    <string name="eliminatee">淘汰</string>
+    <string name="water">饮水:</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 628d35d..e3568a7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,7 +7,7 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-        <item name="actionMenuTextColor">@color/colorPrimaryDark</item>
+        <item name="actionMenuTextColor">@color/white</item>
         <!-- 设置activity切换动画 -->
         <item name="android:windowAnimationStyle">@style/activityAnimation</item>
     </style>