|
@@ -45,7 +45,7 @@
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
android:layout_marginTop="4dp"
|
|
android:textColor="@color/black"
|
|
android:textColor="@color/black"
|
|
- android:textSize="18sp"
|
|
|
|
|
|
+ android:textSize="24sp"
|
|
android:text="@string/str_empty"/>
|
|
android:text="@string/str_empty"/>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
@@ -55,7 +55,7 @@
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_weight="1"
|
|
- android:layout_marginTop="10dp"
|
|
|
|
|
|
+ android:layout_marginTop="4dp"
|
|
android:gravity="center_horizontal"
|
|
android:gravity="center_horizontal"
|
|
android:orientation="vertical"
|
|
android:orientation="vertical"
|
|
android:background="@color/white">
|
|
android:background="@color/white">
|
|
@@ -78,7 +78,7 @@
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
android:layout_marginTop="4dp"
|
|
android:textColor="@color/black"
|
|
android:textColor="@color/black"
|
|
- android:textSize="18sp"
|
|
|
|
|
|
+ android:textSize="24sp"
|
|
android:text="@string/str_empty"/>
|
|
android:text="@string/str_empty"/>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
@@ -123,8 +123,8 @@
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:paddingTop="4dp"
|
|
android:paddingTop="4dp"
|
|
- android:paddingLeft="12dp"
|
|
|
|
- android:paddingRight="12dp"
|
|
|
|
|
|
+ android:paddingLeft="10dp"
|
|
|
|
+ android:paddingRight="10dp"
|
|
android:background="@color/white"
|
|
android:background="@color/white"
|
|
android:orientation="vertical"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
android:visibility="gone">
|
|
@@ -156,18 +156,21 @@
|
|
android:textSize="20sp"
|
|
android:textSize="20sp"
|
|
android:textColor="@color/white"/>
|
|
android:textColor="@color/white"/>
|
|
|
|
|
|
- <TextView
|
|
|
|
|
|
+ <com.wdkl.ncs.android.lib.widget.MarqueeTextView
|
|
android:id="@+id/tv_nurse_value6"
|
|
android:id="@+id/tv_nurse_value6"
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_weight="1"
|
|
android:paddingRight="6dp"
|
|
android:paddingRight="6dp"
|
|
android:paddingBottom="6dp"
|
|
android:paddingBottom="6dp"
|
|
|
|
+ android:ellipsize="marquee"
|
|
|
|
+ android:focusable="true"
|
|
|
|
+ android:focusableInTouchMode="true"
|
|
|
|
+ android:marqueeRepeatLimit="marquee_forever"
|
|
android:singleLine="true"
|
|
android:singleLine="true"
|
|
- android:ellipsize="end"
|
|
|
|
android:gravity="right|bottom"
|
|
android:gravity="right|bottom"
|
|
android:text="@string/str_empty"
|
|
android:text="@string/str_empty"
|
|
- android:textSize="22sp"
|
|
|
|
|
|
+ android:textSize="24sp"
|
|
android:textColor="@color/white"/>
|
|
android:textColor="@color/white"/>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
@@ -191,18 +194,21 @@
|
|
android:textSize="20sp"
|
|
android:textSize="20sp"
|
|
android:textColor="@color/white"/>
|
|
android:textColor="@color/white"/>
|
|
|
|
|
|
- <TextView
|
|
|
|
|
|
+ <com.wdkl.ncs.android.lib.widget.MarqueeTextView
|
|
android:id="@+id/tv_nurse_value7"
|
|
android:id="@+id/tv_nurse_value7"
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_weight="1"
|
|
android:paddingRight="6dp"
|
|
android:paddingRight="6dp"
|
|
android:paddingBottom="6dp"
|
|
android:paddingBottom="6dp"
|
|
|
|
+ android:ellipsize="marquee"
|
|
|
|
+ android:focusable="true"
|
|
|
|
+ android:focusableInTouchMode="true"
|
|
|
|
+ android:marqueeRepeatLimit="marquee_forever"
|
|
android:singleLine="true"
|
|
android:singleLine="true"
|
|
- android:ellipsize="end"
|
|
|
|
android:gravity="right|bottom"
|
|
android:gravity="right|bottom"
|
|
android:text="@string/str_empty"
|
|
android:text="@string/str_empty"
|
|
- android:textSize="22sp"
|
|
|
|
|
|
+ android:textSize="24sp"
|
|
android:textColor="@color/white"/>
|
|
android:textColor="@color/white"/>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
@@ -226,27 +232,35 @@
|
|
android:textSize="20sp"
|
|
android:textSize="20sp"
|
|
android:textColor="@color/white"/>
|
|
android:textColor="@color/white"/>
|
|
|
|
|
|
- <TextView
|
|
|
|
|
|
+ <com.wdkl.ncs.android.lib.widget.MarqueeTextView
|
|
android:id="@+id/tv_nurse_value8"
|
|
android:id="@+id/tv_nurse_value8"
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_weight="1"
|
|
android:paddingRight="6dp"
|
|
android:paddingRight="6dp"
|
|
android:paddingBottom="6dp"
|
|
android:paddingBottom="6dp"
|
|
|
|
+ android:ellipsize="marquee"
|
|
|
|
+ android:focusable="true"
|
|
|
|
+ android:focusableInTouchMode="true"
|
|
|
|
+ android:marqueeRepeatLimit="marquee_forever"
|
|
android:singleLine="true"
|
|
android:singleLine="true"
|
|
- android:ellipsize="end"
|
|
|
|
android:gravity="right|bottom"
|
|
android:gravity="right|bottom"
|
|
android:text="@string/str_empty"
|
|
android:text="@string/str_empty"
|
|
- android:textSize="22sp"
|
|
|
|
|
|
+ android:textSize="24sp"
|
|
android:textColor="@color/white"/>
|
|
android:textColor="@color/white"/>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
- <TextView
|
|
|
|
|
|
+ <com.wdkl.ncs.android.lib.widget.MarqueeTextView
|
|
android:id="@+id/tv_custom_name"
|
|
android:id="@+id/tv_custom_name"
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:textSize="56sp"
|
|
|
|
|
|
+ android:ellipsize="marquee"
|
|
|
|
+ android:focusable="true"
|
|
|
|
+ android:focusableInTouchMode="true"
|
|
|
|
+ android:marqueeRepeatLimit="marquee_forever"
|
|
|
|
+ android:singleLine="true"
|
|
|
|
+ android:textSize="72sp"
|
|
android:textStyle="bold"
|
|
android:textStyle="bold"
|
|
android:textColor="@color/main_color"
|
|
android:textColor="@color/main_color"
|
|
android:text="---"/>
|
|
android:text="---"/>
|
|
@@ -256,7 +270,7 @@
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@id/tv_custom_name"
|
|
android:layout_below="@id/tv_custom_name"
|
|
android:layout_marginLeft="4dp"
|
|
android:layout_marginLeft="4dp"
|
|
- android:background="@mipmap/ic_gender_male"/>
|
|
|
|
|
|
+ android:textSize="28sp"/>
|
|
<TextView
|
|
<TextView
|
|
android:id="@+id/tv_custom_age"
|
|
android:id="@+id/tv_custom_age"
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
@@ -289,40 +303,18 @@
|
|
android:id="@+id/main_view_qr_code"
|
|
android:id="@+id/main_view_qr_code"
|
|
android:layout_width="180dp"
|
|
android:layout_width="180dp"
|
|
android:layout_height="180dp"
|
|
android:layout_height="180dp"
|
|
- android:layout_marginRight="-2dp"
|
|
|
|
|
|
+ android:layout_marginRight="-4dp"
|
|
android:layout_alignParentRight="true"/>
|
|
android:layout_alignParentRight="true"/>
|
|
- <!--<TextView
|
|
|
|
- android:id="@+id/tv_order_title"
|
|
|
|
- android:layout_width="match_parent"
|
|
|
|
|
|
+ <TextView
|
|
|
|
+ android:layout_width="180dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:layout_below="@id/tv_custom_indate"
|
|
|
|
- android:layout_marginTop="20dp"
|
|
|
|
- android:padding="10dp"
|
|
|
|
- android:background="#F3F9FE"
|
|
|
|
- android:drawableLeft="@mipmap/ic_order"
|
|
|
|
- android:drawablePadding="10dp"
|
|
|
|
- android:textSize="24sp"
|
|
|
|
- android:textColor="@color/black"
|
|
|
|
- android:text=""/>-->
|
|
|
|
- <com.wdkl.ncs.android.lib.widget.MarqueeTextView
|
|
|
|
- android:id="@+id/tv_order_content"
|
|
|
|
- android:layout_width="match_parent"
|
|
|
|
- android:layout_height="match_parent"
|
|
|
|
android:layout_below="@id/main_view_qr_code"
|
|
android:layout_below="@id/main_view_qr_code"
|
|
- android:layout_above="@id/ll_nurse_more"
|
|
|
|
- android:layout_marginTop="4dp"
|
|
|
|
- android:padding="10dp"
|
|
|
|
- android:ellipsize="marquee"
|
|
|
|
- android:focusable="true"
|
|
|
|
- android:focusableInTouchMode="true"
|
|
|
|
- android:marqueeRepeatLimit="marquee_forever"
|
|
|
|
- android:scrollHorizontally="true"
|
|
|
|
- android:singleLine="true"
|
|
|
|
- android:background="#F3F9FE"
|
|
|
|
- android:textSize="24sp"
|
|
|
|
- android:textColor="#131313"
|
|
|
|
- android:text="@string/str_empty"
|
|
|
|
- android:lineSpacingExtra="12dp"/>
|
|
|
|
|
|
+ android:layout_marginRight="-10dp"
|
|
|
|
+ android:layout_alignParentRight="true"
|
|
|
|
+ android:gravity="center"
|
|
|
|
+ android:text="扫码点餐"
|
|
|
|
+ android:textColor="@color/main_color"
|
|
|
|
+ android:textSize="24sp"/>
|
|
</RelativeLayout>
|
|
</RelativeLayout>
|
|
</FrameLayout>
|
|
</FrameLayout>
|
|
|
|
|