Jelajahi Sumber

<主机界面修改>

weizhengliang 5 tahun lalu
induk
melakukan
dcc982b006

+ 1 - 1
app/src/main/res/layout/fragment_calling_doctor_medica_hosts.xml

@@ -50,7 +50,7 @@
     <RelativeLayout
         android:id="@+id/fragment_calling_host_rl_right"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true">

+ 65 - 27
app/src/main/res/layout/fragment_medical_hosts_call_queuing_info_bar_layout.xml

@@ -8,7 +8,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <TextView
@@ -19,48 +19,87 @@
             android:paddingLeft="@dimen/margin_5dp"
             android:text="呼叫排队信息栏"
             android:textColor="@color/white"
-            android:textSize="20px" />
+            android:textSize="20px"
+            android:visibility="gone"/>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/fragment_rv_calling_queuing_info_bar"
             android:layout_width="match_parent"
             android:layout_height="240dp"
             android:overScrollMode="never"
-            android:background="@drawable/shape_medical_host_not_in_call_bg"/>
-
-        <TextView
-            android:id="@+id/fragment_tv_calling_tips"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_gravity="center"
-            android:layout_marginLeft="0.5dp"
-            android:layout_marginRight="0.5dp"
-            android:background="#1d5e8b"
-            android:gravity="center_vertical"
-            android:paddingLeft="@dimen/margin_5dp"
-            android:textColor="@color/yellow_color"
-            android:textSize="20px" />
+            android:background="@drawable/shape_medical_host_not_in_call_bg"
+            android:visibility="gone"/>
 
         <RelativeLayout
             android:id="@+id/fragment_rl_not_in_call_bg"
             android:layout_width="match_parent"
-            android:layout_height="400dp"
-            android:background="@drawable/shape_medical_host_not_in_call_bg">
+            android:layout_height="match_parent"
+            android:background="@drawable/shape_medical_host_not_in_call_bg"
+            android:visibility="gone">
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/fragment_medical_host_rl_in_call"
             android:layout_width="match_parent"
-            android:layout_height="400dp"
-            android:background="@drawable/shape_medical_host_in_call_bg"
-            android:visibility="gone">
+            android:layout_height="match_parent"
+            android:background="#2e95cf">
+
+            <TextView
+                android:id="@+id/tv_doctor_on_duty"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:background="#287fa8"
+                android:gravity="center"
+                android:paddingLeft="@dimen/margin_5dp"
+                android:text="值班医生"
+                android:textColor="@color/white"
+                android:textSize="20sp" />
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/fragment_rv_doctors"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_below="@id/tv_doctor_on_duty"
+                android:overScrollMode="never"
+                android:background="#2e95cf" />
+
+            <TextView
+                android:id="@+id/tv_nurse_on_duty"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_below="@id/fragment_rv_doctors"
+                android:background="#287fa8"
+                android:gravity="center"
+                android:paddingLeft="@dimen/margin_5dp"
+                android:text="值班护士"
+                android:textColor="@color/white"
+                android:textSize="20sp" />
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/fragment_rv_nurses"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_below="@id/tv_nurse_on_duty"
+                android:overScrollMode="never"
+                android:background="#2e95cf" />
+
+            <TextView
+                android:id="@+id/fragment_tv_calling_tips"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_below="@id/fragment_rv_nurses"
+                android:background="#1d5e8b"
+                android:gravity="center"
+                android:textColor="@color/yellow_color"
+                android:textSize="16sp" />
 
             <ImageView
                 android:id="@+id/fragment_iv_doctor_or_nurse_calling"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
+                android:layout_below="@id/fragment_tv_calling_tips"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/margin_30dp"
+                android:layout_marginTop="80dp"
                 android:background="@mipmap/ic_trusteeship_n" />
 
             <TextView
@@ -70,19 +109,18 @@
                 android:layout_below="@+id/fragment_iv_doctor_or_nurse_calling"
                 android:layout_centerInParent="true"
                 android:layout_marginTop="@dimen/margin_10dp"
-                android:text="医生主机二"
+                android:text="--"
                 android:textColor="@color/white"
-                android:textSize="20px" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:id="@+id/fragment_iv_end_calling"
                 android:layout_width="100dp"
                 android:layout_height="40dp"
                 android:layout_below="@+id/fragment_tv_doctor_nurse_no"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="130dp"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="80dp"
                 android:background="@mipmap/ic_calling_sickbed_right_calling" />
-
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>