|
@@ -83,19 +83,6 @@
|
|
|
android:textSize="24sp"
|
|
|
android:text="@string/nurse_title"/>
|
|
|
</LinearLayout>
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_version"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="0dp"
|
|
|
- android:layout_weight="2"
|
|
|
- android:layout_marginTop="4dp"
|
|
|
- android:background="@color/white"
|
|
|
- android:gravity="center"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="12sp"
|
|
|
- android:text="v--"
|
|
|
- android:visibility="gone"/>
|
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
@@ -264,11 +251,19 @@
|
|
|
</LinearLayout>
|
|
|
</LinearLayout>
|
|
|
|
|
|
+ <ImageView
|
|
|
+ android:id="@+id/view_custom_qr_code"
|
|
|
+ android:layout_width="200dp"
|
|
|
+ android:layout_height="200dp"
|
|
|
+ android:layout_above="@id/ll_nurse_more"
|
|
|
+ android:layout_alignParentRight="true" />
|
|
|
+
|
|
|
<com.wdkl.ncs.android.lib.widget.MarqueeTextView
|
|
|
android:id="@+id/tv_custom_name"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
android:layout_above="@id/ll_nurse_more"
|
|
|
+ android:layout_toLeftOf="@id/view_custom_qr_code"
|
|
|
android:paddingLeft="10dp"
|
|
|
android:paddingRight="10dp"
|
|
|
android:gravity="center"
|
|
@@ -277,40 +272,11 @@
|
|
|
android:focusableInTouchMode="true"
|
|
|
android:marqueeRepeatLimit="-1"
|
|
|
android:singleLine="true"
|
|
|
- android:textSize="132sp"
|
|
|
+ android:textSize="112sp"
|
|
|
android:textColor="@color/main_color"
|
|
|
android:textStyle="bold"
|
|
|
android:text="---"/>
|
|
|
|
|
|
- <!--<TextView
|
|
|
- android:id="@+id/tv_order_title"
|
|
|
- android:layout_width="match_parent"
|
|
|
- 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="" />-->
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_order_content"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="match_parent"
|
|
|
- android:layout_below="@id/tv_custom_name"
|
|
|
- android:layout_above="@id/ll_nurse_more"
|
|
|
- android:layout_marginTop="20dp"
|
|
|
- android:padding="10dp"
|
|
|
- android:background="#F3F9FE"
|
|
|
- android:scrollbars="vertical"
|
|
|
- android:fadeScrollbars="true"
|
|
|
- android:textSize="20sp"
|
|
|
- android:textColor="#131313"
|
|
|
- android:text="@string/str_empty"
|
|
|
- android:lineSpacingExtra="12dp"
|
|
|
- android:visibility="gone"/>
|
|
|
</RelativeLayout>
|
|
|
</FrameLayout>
|
|
|
|