|
@@ -10,17 +10,86 @@
|
|
android:id="@+id/activity_calling_door_layout_title"
|
|
android:id="@+id/activity_calling_door_layout_title"
|
|
layout="@layout/view_title_layout"/>
|
|
layout="@layout/view_title_layout"/>
|
|
|
|
|
|
|
|
+ <LinearLayout
|
|
|
|
+ android:id="@+id/ll_room_name"
|
|
|
|
+ android:layout_width="match_parent"
|
|
|
|
+ android:layout_height="148dp"
|
|
|
|
+ android:layout_marginLeft="10dp"
|
|
|
|
+ android:layout_marginRight="10dp"
|
|
|
|
+ android:layout_below="@id/activity_calling_door_layout_title">
|
|
|
|
+
|
|
|
|
+ <LinearLayout
|
|
|
|
+ android:layout_width="0dp"
|
|
|
|
+ android:layout_height="match_parent"
|
|
|
|
+ android:layout_marginTop="-10dp"
|
|
|
|
+ android:layout_weight="2.2"
|
|
|
|
+ android:paddingLeft="20dp"
|
|
|
|
+ android:paddingRight="20dp">
|
|
|
|
+ <com.wdkl.ncs.android.lib.widget.MarqueeTextView
|
|
|
|
+ android:id="@+id/tv_room_name"
|
|
|
|
+ android:layout_width="match_parent"
|
|
|
|
+ android:layout_height="match_parent"
|
|
|
|
+ android:gravity="center_vertical"
|
|
|
|
+ android:text="--"
|
|
|
|
+ android:textColor="@color/main_color"
|
|
|
|
+ android:textSize="120sp"
|
|
|
|
+ android:textStyle="bold"
|
|
|
|
+ android:singleLine="true"
|
|
|
|
+ android:ellipsize="marquee"
|
|
|
|
+ android:focusable="true"
|
|
|
|
+ android:focusableInTouchMode="true" />
|
|
|
|
+ </LinearLayout>
|
|
|
|
+
|
|
|
|
+ <LinearLayout
|
|
|
|
+ android:id="@+id/ll_call_view"
|
|
|
|
+ android:layout_width="0dp"
|
|
|
|
+ android:layout_height="match_parent"
|
|
|
|
+ android:layout_weight="1"
|
|
|
|
+ android:orientation="vertical">
|
|
|
|
+ <ViewFlipper
|
|
|
|
+ android:id="@+id/view_flipper"
|
|
|
|
+ android:layout_width="match_parent"
|
|
|
|
+ android:layout_height="100dp"
|
|
|
|
+ android:autoStart="true"
|
|
|
|
+ android:flipInterval="5000"
|
|
|
|
+ android:inAnimation="@anim/slide_up_in"
|
|
|
|
+ android:outAnimation="@anim/slide_down_out">
|
|
|
|
+ <!--<TextView
|
|
|
|
+ android:id="@+id/call_name"
|
|
|
|
+ android:layout_width="wrap_content"
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:layout_gravity="center|right"
|
|
|
|
+ android:text="09床 呼叫"
|
|
|
|
+ android:textColor="@color/color_red"
|
|
|
|
+ android:textSize="32sp" />-->
|
|
|
|
+ </ViewFlipper>
|
|
|
|
+
|
|
|
|
+ <TextView
|
|
|
|
+ android:id="@+id/tv_nurse_countdown_time"
|
|
|
|
+ android:layout_width="wrap_content"
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:padding="4dp"
|
|
|
|
+ android:textSize="32sp"
|
|
|
|
+ android:text="00:00:00"
|
|
|
|
+ android:textColor="@color/zmcx_orange_color"
|
|
|
|
+ android:visibility="gone"/>
|
|
|
|
+ </LinearLayout>
|
|
|
|
+
|
|
|
|
+ </LinearLayout>
|
|
|
|
+
|
|
<TextView
|
|
<TextView
|
|
android:id="@+id/app_version"
|
|
android:id="@+id/app_version"
|
|
android:layout_width="148dp"
|
|
android:layout_width="148dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_alignParentRight="true"
|
|
android:layout_alignParentRight="true"
|
|
|
|
+ android:layout_marginLeft="6dp"
|
|
|
|
+ android:layout_marginRight="6dp"
|
|
android:gravity="center"
|
|
android:gravity="center"
|
|
android:paddingTop="10dp"
|
|
android:paddingTop="10dp"
|
|
android:paddingBottom="10dp"
|
|
android:paddingBottom="10dp"
|
|
android:text="--"
|
|
android:text="--"
|
|
- android:textColor="?attr/myBackgroundColor"
|
|
|
|
|
|
+ android:textColor="?attr/verTextColor"
|
|
android:textSize="20sp" />
|
|
android:textSize="20sp" />
|
|
|
|
|
|
<!--右侧按钮区域-->
|
|
<!--右侧按钮区域-->
|
|
@@ -28,9 +97,10 @@
|
|
android:id="@+id/room_actions"
|
|
android:id="@+id/room_actions"
|
|
android:layout_width="160dp"
|
|
android:layout_width="160dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_height="match_parent"
|
|
- android:layout_marginTop="120dp"
|
|
|
|
- android:layout_below="@id/activity_calling_door_layout_title"
|
|
|
|
- android:layout_above="@id/app_version"
|
|
|
|
|
|
+ android:layout_marginTop="6dp"
|
|
|
|
+ android:layout_marginBottom="6dp"
|
|
|
|
+ android:layout_below="@+id/ll_room_name"
|
|
|
|
+ android:layout_above="@+id/app_version"
|
|
android:layout_alignParentRight="true">
|
|
android:layout_alignParentRight="true">
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
@@ -44,7 +114,7 @@
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="10dp"
|
|
android:layout_marginTop="10dp"
|
|
- android:layout_marginBottom="16dp"
|
|
|
|
|
|
+ android:layout_marginBottom="18dp"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:drawableLeft="@mipmap/ic_home"
|
|
android:drawableLeft="@mipmap/ic_home"
|
|
android:drawablePadding="6dp"
|
|
android:drawablePadding="6dp"
|
|
@@ -54,13 +124,13 @@
|
|
android:ellipsize="end"
|
|
android:ellipsize="end"
|
|
android:text="@string/str_home"
|
|
android:text="@string/str_home"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
- android:textSize="22sp" />
|
|
|
|
|
|
+ android:textSize="24sp" />
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
android:id="@+id/room_action_call_bed"
|
|
android:id="@+id/room_action_call_bed"
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:layout_marginBottom="16dp"
|
|
|
|
|
|
+ android:layout_marginBottom="18dp"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:drawableLeft="@mipmap/ic_call"
|
|
android:drawableLeft="@mipmap/ic_call"
|
|
android:drawablePadding="6dp"
|
|
android:drawablePadding="6dp"
|
|
@@ -70,13 +140,13 @@
|
|
android:ellipsize="end"
|
|
android:ellipsize="end"
|
|
android:text="@string/str_call_bed"
|
|
android:text="@string/str_call_bed"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
- android:textSize="22sp" />
|
|
|
|
|
|
+ android:textSize="24sp" />
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
android:id="@+id/room_action_call"
|
|
android:id="@+id/room_action_call"
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:layout_marginBottom="16dp"
|
|
|
|
|
|
+ android:layout_marginBottom="18dp"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:drawableLeft="@mipmap/ic_call"
|
|
android:drawableLeft="@mipmap/ic_call"
|
|
android:drawablePadding="6dp"
|
|
android:drawablePadding="6dp"
|
|
@@ -86,13 +156,13 @@
|
|
android:ellipsize="end"
|
|
android:ellipsize="end"
|
|
android:text="@string/str_call_nurse"
|
|
android:text="@string/str_call_nurse"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
- android:textSize="22sp" />
|
|
|
|
|
|
+ android:textSize="24sp" />
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
android:id="@+id/room_cancel_call"
|
|
android:id="@+id/room_cancel_call"
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:layout_marginBottom="16dp"
|
|
|
|
|
|
+ android:layout_marginBottom="18dp"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:drawableLeft="@mipmap/ic_call"
|
|
android:drawableLeft="@mipmap/ic_call"
|
|
android:drawablePadding="6dp"
|
|
android:drawablePadding="6dp"
|
|
@@ -102,13 +172,13 @@
|
|
android:ellipsize="end"
|
|
android:ellipsize="end"
|
|
android:text="@string/str_cancel_call"
|
|
android:text="@string/str_cancel_call"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
- android:textSize="22sp" />
|
|
|
|
|
|
+ android:textSize="24sp" />
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
android:id="@+id/room_action_support"
|
|
android:id="@+id/room_action_support"
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:layout_marginBottom="16dp"
|
|
|
|
|
|
+ android:layout_marginBottom="18dp"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:drawableLeft="@mipmap/ic_support"
|
|
android:drawableLeft="@mipmap/ic_support"
|
|
android:drawablePadding="6dp"
|
|
android:drawablePadding="6dp"
|
|
@@ -118,13 +188,13 @@
|
|
android:ellipsize="end"
|
|
android:ellipsize="end"
|
|
android:text="@string/str_support"
|
|
android:text="@string/str_support"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
- android:textSize="22sp" />
|
|
|
|
|
|
+ android:textSize="24sp" />
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
android:id="@+id/room_action_nurse"
|
|
android:id="@+id/room_action_nurse"
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:layout_marginBottom="16dp"
|
|
|
|
|
|
+ android:layout_marginBottom="18dp"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:drawableLeft="@drawable/ic_nursing"
|
|
android:drawableLeft="@drawable/ic_nursing"
|
|
android:drawablePadding="6dp"
|
|
android:drawablePadding="6dp"
|
|
@@ -134,13 +204,13 @@
|
|
android:ellipsize="end"
|
|
android:ellipsize="end"
|
|
android:text="@string/enter_nursing"
|
|
android:text="@string/enter_nursing"
|
|
android:textColor="@color/white"
|
|
android:textColor="@color/white"
|
|
- android:textSize="22sp" />
|
|
|
|
|
|
+ android:textSize="24sp" />
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
android:id="@+id/room_action_power_reset"
|
|
android:id="@+id/room_action_power_reset"
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:layout_marginBottom="16dp"
|
|
|
|
|
|
+ android:layout_marginBottom="18dp"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:background="@mipmap/bg_bottom_btn"
|
|
android:drawableLeft="@mipmap/ic_more"
|
|
android:drawableLeft="@mipmap/ic_more"
|
|
android:drawablePadding="6dp"
|
|
android:drawablePadding="6dp"
|
|
@@ -150,7 +220,7 @@
|
|
android:ellipsize="end"
|
|
android:ellipsize="end"
|
|
android:text="@string/power_reset"
|
|
android:text="@string/power_reset"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
android:textColor="@drawable/selector_bottom_btn_text_color"
|
|
- android:textSize="22sp"
|
|
|
|
|
|
+ android:textSize="24sp"
|
|
android:visibility="gone"/>
|
|
android:visibility="gone"/>
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
@@ -167,79 +237,11 @@
|
|
android:ellipsize="end"
|
|
android:ellipsize="end"
|
|
android:text="@string/str_more"
|
|
android:text="@string/str_more"
|
|
android:textColor="@color/white"
|
|
android:textColor="@color/white"
|
|
- android:textSize="22sp" />
|
|
|
|
|
|
+ android:textSize="24sp" />
|
|
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</ScrollView>
|
|
</ScrollView>
|
|
|
|
|
|
- <LinearLayout
|
|
|
|
- android:id="@+id/ll_room_name"
|
|
|
|
- android:layout_width="match_parent"
|
|
|
|
- android:layout_height="148dp"
|
|
|
|
- android:layout_marginLeft="10dp"
|
|
|
|
- android:layout_marginRight="10dp"
|
|
|
|
- android:layout_below="@id/activity_calling_door_layout_title">
|
|
|
|
-
|
|
|
|
- <LinearLayout
|
|
|
|
- android:layout_width="0dp"
|
|
|
|
- android:layout_height="match_parent"
|
|
|
|
- android:layout_marginTop="-10dp"
|
|
|
|
- android:layout_weight="2.2"
|
|
|
|
- android:paddingLeft="20dp"
|
|
|
|
- android:paddingRight="20dp">
|
|
|
|
- <com.wdkl.ncs.android.lib.widget.MarqueeTextView
|
|
|
|
- android:id="@+id/tv_room_name"
|
|
|
|
- android:layout_width="match_parent"
|
|
|
|
- android:layout_height="match_parent"
|
|
|
|
- android:gravity="center_vertical"
|
|
|
|
- android:text="--"
|
|
|
|
- android:textColor="@color/main_color"
|
|
|
|
- android:textSize="120sp"
|
|
|
|
- android:textStyle="bold"
|
|
|
|
- android:singleLine="true"
|
|
|
|
- android:ellipsize="marquee"
|
|
|
|
- android:focusable="true"
|
|
|
|
- android:focusableInTouchMode="true" />
|
|
|
|
- </LinearLayout>
|
|
|
|
-
|
|
|
|
- <LinearLayout
|
|
|
|
- android:id="@+id/ll_call_view"
|
|
|
|
- android:layout_width="0dp"
|
|
|
|
- android:layout_height="match_parent"
|
|
|
|
- android:layout_weight="1"
|
|
|
|
- android:orientation="vertical">
|
|
|
|
- <ViewFlipper
|
|
|
|
- android:id="@+id/view_flipper"
|
|
|
|
- android:layout_width="match_parent"
|
|
|
|
- android:layout_height="100dp"
|
|
|
|
- android:autoStart="true"
|
|
|
|
- android:flipInterval="5000"
|
|
|
|
- android:inAnimation="@anim/slide_up_in"
|
|
|
|
- android:outAnimation="@anim/slide_down_out">
|
|
|
|
- <!--<TextView
|
|
|
|
- android:id="@+id/call_name"
|
|
|
|
- android:layout_width="wrap_content"
|
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
- android:layout_gravity="center|right"
|
|
|
|
- android:text="09床 呼叫"
|
|
|
|
- android:textColor="@color/color_red"
|
|
|
|
- android:textSize="32sp" />-->
|
|
|
|
- </ViewFlipper>
|
|
|
|
-
|
|
|
|
- <TextView
|
|
|
|
- android:id="@+id/tv_nurse_countdown_time"
|
|
|
|
- android:layout_width="wrap_content"
|
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
- android:padding="4dp"
|
|
|
|
- android:textSize="32sp"
|
|
|
|
- android:text="00:00:00"
|
|
|
|
- android:textColor="@color/zmcx_orange_color"
|
|
|
|
- android:visibility="gone"/>
|
|
|
|
- </LinearLayout>
|
|
|
|
-
|
|
|
|
- </LinearLayout>
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
|
|
<!--床位fragment区域-->
|
|
<!--床位fragment区域-->
|
|
<FrameLayout
|
|
<FrameLayout
|