Skip to content

Commit

Permalink
修改版本
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZhoujunAndroid
ZhoujunAndroid committed Dec 5, 2013
1 parent c4a749b commit 74816fa
Show file tree
Hide file tree
Showing 21 changed files with 1,147 additions and 301 deletions.
6 changes: 3 additions & 3 deletions baby/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<activity android:name=".activity.AuthorizeActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<activity android:name=".activity.SettingActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<activity android:name=".activity.ChangePasswordActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<activity android:name=".activity.NewAddBabyRecordActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<activity android:name=".activity.NewAddBabyRecordActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden" android:windowSoftInputMode="stateHidden|adjustPan"></activity>
<activity android:name=".activity.ChooseMilkActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>

<!-- 登录相关界面 -->
Expand All @@ -60,10 +60,10 @@
<activity android:name=".activity.baby.BabyMyActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<activity android:name=".activity.baby.BabyInfoEditActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<activity android:name=".activity.baby.FitmentActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<activity android:name=".activity.baby.BabyDetailActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<activity android:name=".activity.baby.BabyDetailActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden" android:windowSoftInputMode="stateHidden|adjustPan"></activity>
<activity android:name=".activity.baby.BabyStatusActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>

<activity android:name=".activity.baby.AddVisitRecordActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<activity android:name=".activity.baby.AddVisitRecordActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden" android:windowSoftInputMode="stateHidden|adjustPan"></activity>
<activity android:name=".activity.baby.BabyHomeActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<activity android:name=".activity.AddMilkActivity" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"></activity>
<!-- push服务 -->
Expand Down
102 changes: 82 additions & 20 deletions baby/res/layout/baby_my_activity.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,12 @@
android:gravity="center_vertical"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingRight="10dp"
android:orientation="horizontal" >

<TextView
style="@style/info_label_style"
android:text="@string/baby_my_id"/>
android:text="家长手机号:"/>

<TextView
android:id="@+id/tvId" style="@style/info_text_style"/>
Expand All @@ -81,12 +82,17 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingTop="12dp" >
android:paddingTop="12dp"
android:paddingRight="10dp" >

<TextView
style="@style/info_label_style" android:text="@string/baby_my_name" />

<TextView android:id="@+id/tvRealName" style="@style/info_text_style" />
<EditText android:id="@+id/etRealName" style="@style/info_text_style" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_grey_right_arrow" />
</LinearLayout>

<View
Expand All @@ -100,10 +106,15 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingTop="12dp" >
android:paddingTop="12dp"
android:paddingRight="10dp">

<TextView style="@style/info_label_style" android:text="@string/baby_my_gender" />
<TextView android:id="@+id/tvGendar" style="@style/info_text_style" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_grey_right_arrow" />
</LinearLayout>

<View
Expand All @@ -117,10 +128,15 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingTop="12dp" >
android:paddingTop="12dp"
android:paddingRight="10dp" >

<TextView style="@style/info_label_style" android:text="@string/baby_my_preproduction" />
<TextView android:id="@+id/tvPreproductions" style="@style/info_text_style" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_grey_right_arrow" />
</LinearLayout>

<View
Expand All @@ -134,15 +150,25 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingTop="12dp" >
android:paddingTop="12dp"
android:paddingRight="10dp" >

<TextView
style="@style/info_label_style"
android:text="@string/baby_my_height" />

<TextView
android:id="@+id/tvHeight"
style="@style/info_text_style"/>
<EditText
android:id="@+id/etHeight"
android:inputType="number"
style="@style/info_text_style"
android:gravity="right"/>
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:textSize="@dimen/BasicTextSize" android:textColor="@color/gold" android:text="cm"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_grey_right_arrow"
android:visibility="invisible" />
</LinearLayout>

<View
Expand All @@ -156,15 +182,25 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingTop="12dp" >
android:paddingTop="12dp"
android:paddingRight="10dp" >

<TextView
style="@style/info_label_style"
android:text="@string/baby_my_weight" />

<TextView
android:id="@+id/tvWeight"
style="@style/info_text_style" />
<EditText
android:id="@+id/etWeight"
android:inputType="number"
style="@style/info_text_style"
android:gravity="right"/>
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:textSize="@dimen/BasicTextSize" android:textColor="@color/gold" android:text="kg"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_grey_right_arrow"
android:visibility="invisible" />
</LinearLayout>
<View
android:layout_width="match_parent"
Expand All @@ -177,15 +213,25 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingTop="12dp" >
android:paddingTop="12dp"
android:paddingRight="10dp">

<TextView
style="@style/info_label_style"
android:text="@string/baby_my_head_circumference" />

<TextView
android:id="@+id/tvHeadCircumference"
style="@style/info_text_style" />
<EditText
android:id="@+id/etHeadCircumference"
android:inputType="number"
style="@style/info_text_style"
android:gravity="right" />
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:textSize="@dimen/BasicTextSize" android:textColor="@color/gold" android:text="cm"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_grey_right_arrow"
android:visibility="invisible" />
</LinearLayout>

<View
Expand All @@ -199,7 +245,8 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingTop="12dp" >
android:paddingTop="12dp"
android:paddingRight="10dp">

<TextView
style="@style/info_label_style"
Expand All @@ -208,6 +255,10 @@
<TextView
android:id="@+id/tvDeliveryWay"
style="@style/info_text_style" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_grey_right_arrow" />
</LinearLayout>
<View
android:layout_width="match_parent"
Expand All @@ -220,7 +271,8 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingTop="12dp" >
android:paddingTop="12dp"
android:paddingRight="10dp" >

<TextView
style="@style/info_label_style"
Expand All @@ -229,6 +281,10 @@
<TextView
android:id="@+id/tvComplication"
style="@style/info_text_style" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_grey_right_arrow" />
</LinearLayout>
<View
android:layout_width="match_parent"
Expand All @@ -241,7 +297,8 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingTop="12dp" >
android:paddingTop="12dp"
android:paddingRight="10dp" >

<TextView
style="@style/info_label_style"
Expand All @@ -250,6 +307,11 @@
<TextView
android:id="@+id/tvApgar"
style="@style/info_text_style" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_grey_right_arrow"
android:visibility="invisible"/>
</LinearLayout>
</LinearLayout>

Expand Down
5 changes: 3 additions & 2 deletions baby/res/layout/dialog_doctor_list.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
android:padding="8dp" >
Expand All @@ -18,7 +18,8 @@
<ListView
android:id="@+id/doctorListView"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
android:layout_height="wrap_content"
android:background="@color/white" >
</ListView>

</LinearLayout>
2 changes: 1 addition & 1 deletion baby/res/layout/doctor_home_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
android:textSize="@dimen/LargeTextSize" android:layout_marginLeft="10dp"/>
</LinearLayout>
<ImageView android:id="@+id/ivCollect" android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="5dp"/>
android:layout_marginRight="5dp" android:padding="5dp"/>

</LinearLayout>
Loading

0 comments on commit 74816fa

Please sign in to comment.