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 0000000..d2df403 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/clock.png differ 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 @@ + android:layout_height="match_parent" + android:background="@color/greyf4f4f4" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + \ 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"> \ 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 @@ + + + + \ 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 @@ 标准 和标准对比 死亡 + 死亡: 体重 + 体重: 死淘 对比项 显示内容 养殖场 + 养殖场: 指标 龄段 周龄 日龄 + 日龄: 公母死亡 公死亡数 母死亡数 条件 栋舍 + 栋舍: 昌乐 寿光东 寿光西 @@ -62,5 +67,11 @@ 生产日报 基本属性 单据明细 + 保存 + 会计单位: + 存活率: + 淘汰: + 淘汰 + 饮水: 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 @@ @color/colorPrimaryDark @color/colorAccent @style/DrawerArrowStyle - @color/colorPrimaryDark + @color/white @style/activityAnimation