<月子中心5寸分机界面修改>

app/src/main/java/com/wdkl/callingbed/ui/CallingBedActivity.java

@@ -24,6 +24,7 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
@@ -302,8 +303,6 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
     @Bind(R.id.view_main_layout_iv_nurse)
     ImageView ivNurse;
 
-    @Bind(R.id.view_main_layout_img_two_dimensional_code)
-    ImageView ivTwoDimensionalCode;
 
     //医嘱界面
     @Bind(R.id.view_doctor_tv_name)
@@ -380,6 +379,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
     private RelativeLayout rlBottomMessage;
     private ImageView ivWelcome;
     private MyTextView tvNoticeContent;
+    private ImageView ivNotice;
     // 语音播报
     private TextToSpeech textToSpeech;
     //开启的线程
@@ -586,6 +586,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
         rlBottomMessage = vMain.findViewById(R.id.view_main_layout_rl_message);
         ivWelcome = vWelcome.findViewById(R.id.view_welcome_iv_main);
         tvNoticeContent = vMain.findViewById(R.id.view_main_layout_tv_msg);
+        ivNotice = vMain.findViewById(R.id.view_main_iv_notice_logo);
         /*******************************************************/
 
         timeThread = new TimeThread();
@@ -1138,29 +1139,22 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
 
             String name = mainDataEntity.getName();
             if (StringUtils.notEmpty(name)) {
-                if (name.length() >= 4) {
-                    tvName.setTextSize(69);
-                    tvName.setText(name);
-                    tvName_big.setTextSize(60);//50
-                    tvName_big.setText(name);
-                } else {
-                    tvName.setTextSize(95);
-                    tvName.setText(name);
-                    tvName_big.setTextSize(65);//55
-                    tvName_big.setText(name);
-                }
+                tvName.setText(name);
+                tvName_big.setText(name);
             } else {
                 tvName.setText("");
                 tvName_big.setText("");
             }
 
-            tvDetail.setText("[ " + mainDataEntity.getSex() + " ]");//"【"+mainDataEntity.getSex()+"】"
+            tvDetail.setText(mainDataEntity.getSex());//"【"+mainDataEntity.getSex()+"】"
             tvDetail_big.setText("[ " + mainDataEntity.getSex() + " ]");//"【"+mainDataEntity.getSex()+"】"
 
             tvIllness.setText(mainDataEntity.getAgeNum() + "" + mainDataEntity.getAgeUnit());
             tvIllness_big.setText(mainDataEntity.getAgeNum() + "" + mainDataEntity.getAgeUnit());
 
-            tvHospNumber.setText("入院:" + mainDataEntity.getInpatientNum());
+            //tvHospNumber.setText("入院:" + mainDataEntity.getInpatientNum());
+
+            tvAdmission.setText("    入住时间: " + mainDataEntity.getAdmissionTime() + "    ");
 
             tvHospData.setText(mainDataEntity.getAdmissionTime());
 
@@ -1173,7 +1167,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                 tvBedNum_big.setText(initDataEntity.getDeviceBedNum());
             }
 
-            Picasso.with(context).load(Constants.URL + Constants.URL_END + "/" + mainDataEntity.getResponsDoctorPic()).transform(new Transformation() {
+            /*Picasso.with(context).load(Constants.URL + Constants.URL_END + "/" + mainDataEntity.getResponsDoctorPic()).transform(new Transformation() {
                 @Override
                 public Bitmap transform(Bitmap source) {
                     Bitmap bitmap = BitmapUtils.zoom(source, DensityUtils.dp2px(context, 62), DensityUtils.dp2px(context, 62));
@@ -1205,7 +1199,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                 public String key() {
                     return "";//需要保证返回值不能为null。否则报错
                 }
-            }).fit().memoryPolicy(MemoryPolicy.NO_CACHE).networkPolicy(NetworkPolicy.NO_CACHE).into(ivNurse);
+            }).fit().memoryPolicy(MemoryPolicy.NO_CACHE).networkPolicy(NetworkPolicy.NO_CACHE).into(ivNurse);*/
 
             setTitle();
         }
@@ -1215,12 +1209,23 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
      * 设置通知页面
      */
     private void setNoticeView() {
-        if (null != noticeArrayList) {
+        if (null != noticeArrayList && noticeArrayList.size() > 0) {
             String strNotice = "";
             for (int i = 0; i < noticeArrayList.size(); i++) {
                 strNotice += "      【" + (i + 1) + "】 " + noticeArrayList.get(i).getNoticeContent() + "  " + noticeArrayList.get(i).getNoticeEndTime();
             }
-            tvNoticeContent.setText(strNotice);
+            if (!TextUtils.isEmpty(strNotice)) {
+                ivNotice.setVisibility(View.VISIBLE);
+                tvNoticeContent.setVisibility(View.VISIBLE);
+                tvNoticeContent.setText(strNotice);
+            } else {
+                ivNotice.setVisibility(View.INVISIBLE);
+                tvNoticeContent.setVisibility(View.INVISIBLE);
+            }
+
+        } else {
+            ivNotice.setVisibility(View.INVISIBLE);
+            tvNoticeContent.setVisibility(View.INVISIBLE);
         }
     }
 

app/src/main/res/drawable/shape_bed_name_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF"/>
+    <corners
+        android:bottomRightRadius="10dp"
+        android:bottomLeftRadius="10dp" />
+</shape>

app/src/main/res/drawable/shape_bed_num_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FBE5E8"/>
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp" />
+</shape>

app/src/main/res/drawable/shape_circle_bg.xml

@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#C823BE"/>
+    <size
+        android:height="20dp"
+        android:width="20dp"/>
+</shape>

app/src/main/res/drawable/shape_circle_bg_age.xml

@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#E85E5B"/>
+    <size
+        android:height="20dp"
+        android:width="20dp"/>
+</shape>

app/src/main/res/drawable/shape_cost_bg.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-       <solid android:color="#FFFFFF"/>    
-       <corners android:topLeftRadius="10dp"
+    <solid android:color="#FFFFFF"/>
+    <corners android:topLeftRadius="10dp"
                 android:topRightRadius="10dp"
                 android:bottomRightRadius="10dp"
-                android:bottomLeftRadius="10dp"
-           />
+                android:bottomLeftRadius="10dp" />
 </shape>

app/src/main/res/drawable/shape_mai_bg_doctor_title.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-       <solid android:color="#2B87B9"/>    
-    <corners android:topLeftRadius="5dp"
-        android:topRightRadius="5dp"
-        />
+    <solid android:color="#D4676A"/>
+    <corners
+        android:topLeftRadius="5dp"
+        android:topRightRadius="5dp" />
 </shape>

app/src/main/res/drawable/shape_main_bg_doctor_bottom.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-       <solid android:color="#2B87B9"/>    
+    <solid android:color="#D4676A"/>
     <corners
         android:bottomRightRadius="5dp"
-        android:bottomLeftRadius="5dp"
-        />
+        android:bottomLeftRadius="5dp" />
 </shape>

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

@@ -11,7 +11,6 @@
             android:id="@+id/item_doctor_layout_num"
             android:background="@drawable/shape_item_bg"
             android:textColor="@color/white"
-
             android:layout_marginLeft="@dimen/margin_to_side_20"
             android:layout_marginTop="@dimen/margin_to_side_5"
             android:textSize="@dimen/font_size_20"

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black"
+    android:background="#FCADB1"
     android:orientation="vertical">
 
 

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

@@ -27,7 +27,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="20dp"
                 android:text="--"
-                android:textColor="#3A92D1"
+                android:textColor="#FF5963"
                 android:textSize="@dimen/font_size_25"
                 android:textStyle="bold" />
 
@@ -40,7 +40,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="50dp"
                 android:text="--"
-                android:textColor="#3A92D1"
+                android:textColor="#FF5963"
                 android:textSize="@dimen/font_size_25"
                 android:textStyle="bold" />
         </RelativeLayout>
@@ -53,7 +53,7 @@
             android:layout_below="@+id/view_cost_layout_rl_title"
             android:paddingLeft="@dimen/font_size_20"
             android:paddingRight="@dimen/font_size_20"
-            android:paddingTop="@dimen/font_size_20"></android.support.v7.widget.RecyclerView>
+            android:paddingTop="@dimen/font_size_20"/>
 
         <TextView
             android:id="@+id/view_cost_layout_tv_text"
@@ -69,7 +69,7 @@
             android:paddingLeft="@dimen/margin_to_side_10"
             android:paddingRight="@dimen/margin_to_side_10"
             android:text="               更多信息请按右侧按键扫描二维码               "
-            android:textColor="#3A92D1"
+            android:textColor="#FF5963"
             android:textSize="@dimen/font_size_20" />
     </RelativeLayout>
 </RelativeLayout>

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

@@ -28,7 +28,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="20dp"
                 android:text="--"
-                android:textColor="#3A92D1"
+                android:textColor="#FF5963"
                 android:textSize="@dimen/font_size_25"
                 android:textStyle="bold" />
 
@@ -41,7 +41,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="50dp"
                 android:text="--"
-                android:textColor="#3A92D1"
+                android:textColor="#FF5963"
                 android:textSize="@dimen/font_size_25"
                 android:textStyle="bold" />
         </RelativeLayout>
@@ -51,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/view_doctor_layout_tv_text"
-            android:layout_below="@+id/view_doctor_layout_rl_title"></android.support.v7.widget.RecyclerView>
+            android:layout_below="@+id/view_doctor_layout_rl_title"/>
 
         <TextView
             android:id="@+id/view_doctor_layout_tv_text"
@@ -67,7 +67,7 @@
             android:paddingLeft="@dimen/margin_to_side_10"
             android:paddingRight="@dimen/margin_to_side_10"
             android:text="               更多信息请按右侧按键扫描二维码               "
-            android:textColor="#3A92D1"
+            android:textColor="#FF5963"
             android:textSize="@dimen/font_size_20" />
     </RelativeLayout>
 </RelativeLayout>

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

@@ -8,13 +8,14 @@
         android:id="@+id/activity_calling_bed_layout_ll_left"
         android:layout_width="150dp"
         android:layout_height="match_parent"
-        android:background="#1C5C9E"
+        android:background="#FCADB1"
+        android:paddingTop="16dp"
         android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="75dp"
-            android:background="#2B76B7"
+            android:background="#EA4F77"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -41,12 +42,13 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"></View>
+            android:background="#B34A44"
+            android:layout_weight="1"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="75dp"
-            android:background="#2B76B7"
+            android:background="#EA4F77"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -72,12 +74,13 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"></View>
+            android:background="#B34A44"
+            android:layout_weight="1"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="75dp"
-            android:background="#2B76B7"
+            android:background="#EA4F77"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -103,12 +106,13 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"></View>
+            android:background="#B34A44"
+            android:layout_weight="1"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="75dp"
-            android:background="#2B76B7"
+            android:background="#EA4F77"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -134,12 +138,13 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"></View>
+            android:background="#B34A44"
+            android:layout_weight="1"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="75dp"
-            android:background="#2B76B7"
+            android:background="#EA4F77"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -182,228 +187,124 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
+                android:layout_height="0dp"
+                android:layout_weight="1.15"
+                android:background="@drawable/shape_bed_num_bg"
+                android:orientation="vertical"
+                android:padding="@dimen/margin_to_side_5">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="2"
-                    android:background="@drawable/shape_main_bg_top_left"
-                    android:orientation="vertical"
-                    android:padding="@dimen/margin_to_side_5"
-                    android:visibility="gone">
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/view_main_layout_tv_bed"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true"
-                            android:text="床位"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/font_size_60"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/view_main_layout_tv_bed"
-                            android:layout_centerHorizontal="true"
-                            android:text="--"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/font_size_55"
-                            android:textStyle="bold" />
-                    </RelativeLayout>
-                </LinearLayout>
-
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="#FFFFFF">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_weight="2"
-                        android:orientation="vertical"
-                        android:padding="@dimen/margin_to_side_5">
-
-                        <RelativeLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:gravity="center"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerHorizontal="true"
-                                android:text="--"
-                                android:textColor="#1C5C9E"
-                                android:textSize="@dimen/font_size_50"
-                                android:textStyle="bold"
-                                android:visibility="gone" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerHorizontal="true"
-                                android:text="--"
-                                android:textColor="#1C5C9E"
-                                android:textSize="@dimen/font_size_45"
-                                android:textStyle="bold"
-                                android:visibility="gone" />
-
-                            <com.wdkl.callingbed.util.MarqueeText
-                                android:id="@+id/view_main_layout_tv_bed_num"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerHorizontal="true"
-                                android:layout_centerVertical="true"
-                                android:layout_marginTop="-40dp"
-                                android:ellipsize="marquee"
-                                android:focusable="true"
-                                android:focusableInTouchMode="true"
-                                android:gravity="center"
-                                android:marqueeRepeatLimit="-1"
-                                android:singleLine="true"
-                                android:text="李四四"
-                                android:textColor="@color/black"
-                                android:textSize="180sp"
-                                android:textStyle="bold" />
-
-                        </RelativeLayout>
-                    </LinearLayout>
-
-                </LinearLayout>
+                <com.wdkl.callingbed.util.MarqueeText
+                    android:id="@+id/view_main_layout_tv_bed_num"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="-12dp"
+                    android:layout_gravity="center"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:gravity="center"
+                    android:marqueeRepeatLimit="-1"
+                    android:singleLine="true"
+                    android:text="001床"
+                    android:textColor="#EA4F77"
+                    android:textSize="110sp"
+                    android:textStyle="bold" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="2"
-                    android:background="@drawable/shape_main_bg_bottom_left"
-                    android:gravity="center"
-                    android:visibility="gone">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@color/white">
-
-                        <ImageView
-                            android:id="@+id/view_main_layout_img_two_dimensional_code"
-                            android:layout_width="154dp"
-                            android:layout_height="154dp"
-                            android:padding="8dp"
-                            android:scaleType="fitXY"
-                            android:src="@mipmap/ic_qr_code_default" />
-                    </LinearLayout>
-                </LinearLayout>
-
+                android:layout_height="0dp"
+                android:layout_weight="1.85"
+                android:background="@drawable/shape_bed_name_bg"
+                android:orientation="vertical">
 
-                <LinearLayout
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="#D5EFFC"
-                    android:orientation="vertical">
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_weight="6"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/view_mai_layout_tv_illness_text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="@dimen/margin_to_side_10"
-                            android:layout_marginTop="@dimen/margin_to_side_10"
-                            android:text="病情诊断："
-                            android:textColor="#666666"
-                            android:textSize="@dimen/font_size_20"
-                            android:textStyle="bold"
-                            android:visibility="gone" />
-
-                        <TextView
-                            android:id="@+id/view_main_layout_tv_illness"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_above="@+id/view_main_layout_tv_detail"
-                            android:layout_below="@+id/view_mai_layout_tv_illness_text"
-                            android:layout_alignParentEnd="true"
-                            android:layout_alignParentRight="true"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginBottom="10dp"
-                            android:text="--岁"
-                            android:textColor="@color/black"
-                            android:textSize="50sp"
-                            android:textStyle="bold" />
-
-                        <com.wdkl.callingbed.util.MarqueeText
-                            android:id="@+id/view_main_layout_tv_name"
-                            android:layout_width="300dp"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentLeft="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="5dp"
-                            android:ellipsize="marquee"
-                            android:focusable="true"
-                            android:focusableInTouchMode="true"
-                            android:marqueeRepeatLimit="-1"
-                            android:singleLine="true"
-                            android:text="张三三"
-                            android:textColor="@color/black"
-                            android:textSize="95sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:id="@+id/view_main_layout_tv_detail"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentBottom="true"
-                            android:layout_marginBottom="40dp"
-                            android:layout_alignParentRight="true"
-                            android:layout_marginRight="10dp"
-                            android:text="[ 男 ]"
-                            android:textColor="@color/black"
-                            android:textSize="50sp"
-                            android:textStyle="bold" />
-
-                    </RelativeLayout>
+                    android:layout_height="match_parent">
 
                     <TextView
                         android:id="@+id/view_main_layout_tv_admission"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
+                        android:layout_centerHorizontal="true"
+                        android:layout_alignParentBottom="true"
                         android:layout_marginBottom="@dimen/margin_to_side_5"
-                        android:background="@drawable/shape_main_bg_admission"
+                        android:background="#FBD7D9"
                         android:padding="@dimen/margin_to_side_5"
-                        android:paddingLeft="@dimen/margin_to_side_10"
-                        android:paddingRight="@dimen/margin_to_side_10"
-                        android:text="     入院时间     "
-                        android:textColor="#3A92D1"
-                        android:textSize="@dimen/font_size_18"
-                        android:visibility="gone" />
-                </LinearLayout>
+                        android:paddingLeft="20dp"
+                        android:paddingRight="20dp"
+                        android:text="     入住时间     "
+                        android:textColor="#FF5963"
+                        android:textSize="@dimen/font_size_18" />
+
+                    <View
+                        android:id="@+id/view_center_line"
+                        android:layout_width="2dp"
+                        android:layout_height="match_parent"
+                        android:layout_centerHorizontal="true"
+                        android:layout_above="@id/view_main_layout_tv_admission"
+                        android:layout_marginTop="20dp"
+                        android:layout_marginBottom="20dp"
+                        android:background="#E85E5B"/>
+
+                    <com.wdkl.callingbed.util.MarqueeText
+                        android:id="@+id/view_main_layout_tv_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_above="@id/view_main_layout_tv_admission"
+                        android:layout_toLeftOf="@id/view_center_line"
+                        android:padding="6dp"
+                        android:gravity="center"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:marqueeRepeatLimit="-1"
+                        android:singleLine="true"
+                        android:text="张三三"
+                        android:textColor="#E85E5B"
+                        android:textSize="68sp"
+                        android:textStyle="bold" />
+
+                    <ImageView
+                        android:layout_width="70dp"
+                        android:layout_height="140dp"
+                        android:layout_toRightOf="@id/view_center_line"
+                        android:layout_marginLeft="32dp"
+                        android:layout_marginTop="20dp"
+                        android:src="@mipmap/ic_baby"/>
+
+                    <TextView
+                        android:id="@+id/view_main_layout_tv_illness"
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:layout_above="@+id/view_main_layout_tv_admission"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="20dp"
+                        android:layout_marginBottom="20dp"
+                        android:background="@drawable/shape_circle_bg_age"
+                        android:gravity="center"
+                        android:text="--"
+                        android:textColor="@color/white"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/view_main_layout_tv_detail"
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:layout_above="@id/view_main_layout_tv_illness"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="20dp"
+                        android:layout_marginBottom="20dp"
+                        android:layout_marginTop="20dp"
+                        android:background="@drawable/shape_circle_bg"
+                        android:gravity="center"
+                        android:text="男"
+                        android:textColor="@color/white"
+                        android:textSize="28sp"
+                        android:textStyle="bold" />
+
+                </RelativeLayout>
             </LinearLayout>
         </LinearLayout>
 
@@ -424,15 +325,15 @@
                 android:layout_weight="1"
                 android:background="@drawable/shape_mai_bg_doctor_title"
                 android:gravity="center"
-                android:text="值班医生"
-                android:textColor="#A3DDF9"
+                android:text="责任母婴师"
+                android:textColor="@color/white"
                 android:textSize="@dimen/font_size_20" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="6"
-                android:background="#37A1D5"
+                android:background="#F28B8C"
                 android:gravity="center"
                 android:orientation="vertical">
 
@@ -441,7 +342,7 @@
                     android:layout_width="85dp"
                     android:layout_height="85dp"
                     android:scaleType="fitXY"
-                    android:src="@mipmap/ic_response_doctor" />
+                    android:src="@mipmap/ic_response_baby_care" />
 
                 <TextView
                     android:id="@+id/view_main_layout_tv_doctor_name"
@@ -451,25 +352,23 @@
                     android:text="--"
                     android:textColor="@color/white"
                     android:textSize="@dimen/font_size_20" />
-
-
             </LinearLayout>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:background="#2B87B9"
+                android:background="#D4676A"
                 android:gravity="center"
-                android:text="值班护士"
-                android:textColor="#A3DDF9"
+                android:text="责任护士"
+                android:textColor="@color/white"
                 android:textSize="@dimen/font_size_20" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="6"
-                android:background="#37A1D5"
+                android:background="#F28B8C"
                 android:gravity="center"
                 android:orientation="vertical">
 
@@ -524,7 +423,7 @@
 
         <include
             android:id="@+id/view_main_layout_bottom"
-            layout="@layout/view_message_layout"></include>
+            layout="@layout/view_message_layout"/>
     </RelativeLayout>
 
     <TextView
@@ -534,8 +433,8 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
         android:layout_marginRight="10dp"
-        android:layout_marginBottom="20dp"
+        android:layout_marginBottom="16dp"
         android:text=""
         android:textColor="@color/white"
-        android:textSize="@dimen/font_size_16" />
+        android:textSize="@dimen/font_size_18" />
 </RelativeLayout>

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/view_main_layout_rl_message"
     android:layout_width="match_parent"
-    android:layout_height="60dp"
+    android:layout_height="54dp"
     android:layout_alignParentBottom="true"
     android:gravity="center_vertical"
     android:orientation="horizontal">
@@ -33,8 +33,8 @@
         android:scrollHorizontally="true"
         android:singleLine="true"
         android:textColor="#FCFF16"
-        android:textSize="@dimen/font_size_20"
-        android:visibility="invisible" />
+        android:textSize="24sp"
+        android:visibility="invisible"/>
 
     <TextView
         android:id="@+id/view_main_layout_tv_hosp_number"
@@ -47,7 +47,8 @@
         android:textStyle="bold"
         android:text="入院:1252152545"
         android:textColor="@color/black"
-        android:textSize="31sp" />
+        android:textSize="31sp"
+        android:visibility="gone"/>
 
     <TextView
         android:id="@+id/view_main_layout_tv_hosp_data"
@@ -61,7 +62,8 @@
         android:textStyle="bold"
         android:text="2018/12/25"
         android:textColor="@color/black"
-        android:textSize="31sp" />
+        android:textSize="31sp"
+        android:visibility="gone"/>
 
     <ImageView
         android:id="@+id/view_main_iv_logo"

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black"
+    android:background="#FCADB1"
     android:orientation="vertical">
 
     <ImageView

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black"
+    android:background="#FCADB1"
     android:orientation="vertical">
 
     <RelativeLayout

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

@@ -2,10 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black"
+    android:background="#FCADB1"
     android:orientation="vertical">
 
-
     <ImageView
         android:id="@+id/view_support_layout_iv_pic"
         android:layout_width="200dp"

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="42dp"
-    android:background="#3CA7E3"
+    android:background="@mipmap/title_bg"
     android:orientation="vertical">
 
     <TextView

app/src/main/res/values/styles.xml

@@ -2,9 +2,9 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimary">#EA4F77</item>
+        <item name="colorPrimaryDark">#EA4F77</item>
+        <item name="colorAccent">#EA4F77</item>
         <item name="windowNoTitle">true</item>
     </style>