BWPB3
/
ytzh_Android_ZhongHui
9
0
Fork 0
Code Issues 0 Pull Requests 0 Activity
Browse Source

死淘 和淘汰不一样 ，生产日报表信息详细

master
lh 8 years ago
parent
761a60a027
commit
3e0cde8116
8 changed files with 333 additions and 8 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      app/src/main/res/drawable-xhdpi/clock.png
  2. +1
    -1
      app/src/main/res/layout/act_datanaly_s.xml
  3. +1
    -1
      app/src/main/res/layout/act_datanalysis.xml
  4. +310
    -4
      app/src/main/res/layout/act_productiondaily_info.xml
  5. +1
    -1
      app/src/main/res/menu/chosetime.xml
  6. +8
    -0
      app/src/main/res/menu/save.xml
  7. +11
    -0
      app/src/main/res/values/strings.xml
  8. +1
    -1
      app/src/main/res/values/styles.xml

BIN
app/src/main/res/drawable-xhdpi/clock.png View File

Before After
Width: 51  |  Height: 51  |  Size: 1.8 KiB

+ 1
- 1
app/src/main/res/layout/act_datanaly_s.xml View File

@ -140,7 +140,7 @@
android:button="@null" android:button="@null"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:padding="@dimen/dp_3" android:padding="@dimen/dp_3"
android:text="@string/Death"
android:text="@string/eliminatee"
android:textColor="@color/black303030" android:textColor="@color/black303030"
android:textSize="@dimen/text_size_18" /> android:textSize="@dimen/text_size_18" />


+ 1
- 1
app/src/main/res/layout/act_datanalysis.xml View File

@ -80,7 +80,7 @@
android:layout_weight="2" android:layout_weight="2"
android:drawableLeft="@drawable/shape_perpo" android:drawableLeft="@drawable/shape_perpo"
android:drawablePadding="@dimen/dp_5" android:drawablePadding="@dimen/dp_5"
android:text="@string/Death"
android:text="@string/eliminatee"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_14" /> android:textSize="@dimen/text_size_14" />


+ 310
- 4
app/src/main/res/layout/act_productiondaily_info.xml View File

@ -1,11 +1,317 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@color/greyf4f4f4"
android:layout_width="match_parent" 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> </LinearLayout>

+ 1
- 1
app/src/main/res/menu/chosetime.xml View File

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/chose_time" <item android:id="@+id/chose_time"
android:title="@string/chosedate" android:title="@string/chosedate"
android:icon="@drawable/riqi_3x"
android:icon="@drawable/clock"
android:orderInCategory="70" android:orderInCategory="70"
app:showAsAction="always" /> app:showAsAction="always" />
</menu> </menu>

+ 8
- 0
app/src/main/res/menu/save.xml View File

@ -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>

+ 11
- 0
app/src/main/res/values/strings.xml View File

@ -39,20 +39,25 @@
<string name="standard">标准</string> <string name="standard">标准</string>
<string name="tostandard">和标准对比</string> <string name="tostandard">和标准对比</string>
<string name="death">死亡</string> <string name="death">死亡</string>
<string name="death1">死亡:</string>
<string name="weight">体重</string> <string name="weight">体重</string>
<string name="weight1">体重:</string>
<string name="Death">死淘</string> <string name="Death">死淘</string>
<string name="Contrastiveterm">对比项</string> <string name="Contrastiveterm">对比项</string>
<string name="showcontents">显示内容</string> <string name="showcontents">显示内容</string>
<string name="Farm">养殖场</string> <string name="Farm">养殖场</string>
<string name="farm1">养殖场:</string>
<string name="target">指标</string> <string name="target">指标</string>
<string name="age">龄段</string> <string name="age">龄段</string>
<string name="monage">周龄</string> <string name="monage">周龄</string>
<string name="dayage">日龄</string> <string name="dayage">日龄</string>
<string name="dayage1">日龄:</string>
<string name="Deathofmalemother">公母死亡</string> <string name="Deathofmalemother">公母死亡</string>
<string name="Deathofmale">公死亡数</string> <string name="Deathofmale">公死亡数</string>
<string name="Deathofemale">母死亡数</string> <string name="Deathofemale">母死亡数</string>
<string name="condition">条件</string> <string name="condition">条件</string>
<string name="Buildinghomes">栋舍</string> <string name="Buildinghomes">栋舍</string>
<string name="buildinghomes1">栋舍:</string>
<string name="changle">昌乐</string> <string name="changle">昌乐</string>
<string name="shouguangdong">寿光东</string> <string name="shouguangdong">寿光东</string>
<string name="shouguangxi">寿光西</string> <string name="shouguangxi">寿光西</string>
@ -62,5 +67,11 @@
<string name="Productiondaily_w">生产日报</string> <string name="Productiondaily_w">生产日报</string>
<string name="Basicattributes">基本属性</string> <string name="Basicattributes">基本属性</string>
<string name="Detailsofdocuments">单据明细</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> </resources>

+ 1
- 1
app/src/main/res/values/styles.xml View File

@ -7,7 +7,7 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item> <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
<item name="actionMenuTextColor">@color/colorPrimaryDark</item>
<item name="actionMenuTextColor">@color/white</item>
<!-- 设置activity切换动画 --> <!-- 设置activity切换动画 -->
<item name="android:windowAnimationStyle">@style/activityAnimation</item> <item name="android:windowAnimationStyle">@style/activityAnimation</item>
</style> </style>


Write Preview
Loading…
Cancel
Save