Forráskód Böngészése

<床位和姓名显示支持跑马灯效果>

weizhengliang 4 éve
szülő
commit
649831f6a4

+ 3 - 9
app/src/main/java/com/wdkl/callingbed2/ui/CallingBedActivity.java

@@ -318,7 +318,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
 
     //中间床位信息
     @Bind(R.id.view_main_layout_tv_bed_number)
-    TextView tvBedNum;
+    MarqueeText tvBedNum;
     @Bind(R.id.view_main_layout_iv_bed_qr_code)
     ImageView ivTwoDimensionalCode;
     @Bind(R.id.view_main_layout_tv_duty_doctor)
@@ -330,7 +330,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
 
     //右侧患者信息
     @Bind(R.id.view_main_layout_tv_patient_name)
-    TextView tvName;
+    MarqueeText tvName;
     @Bind(R.id.view_main_layout_tv_age_gender)
     TextView tvAgeGender;
     @Bind(R.id.activity_calling_bed_layout_tv_illness)
@@ -1359,13 +1359,7 @@ 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);
-                } else {
-                    tvName.setTextSize(95);
-                    tvName.setText(name);
-                }
+                tvName.setText(name);
             } else {
                 tvName.setText("---");
             }

+ 16 - 2
app/src/main/res/layout/view_main_layout2.xml

@@ -176,10 +176,17 @@
             android:textColor="@color/white"
             android:textSize="60sp" />
 
-        <TextView
+        <com.wdkl.callingbed2.util.MarqueeText
             android:id="@+id/view_main_layout_tv_bed_number"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:singleLine="true"
             android:text="--"
             android:textColor="@color/white"
             android:textSize="96sp"
@@ -244,11 +251,18 @@
         android:gravity="center_horizontal"
         android:orientation="vertical"
         android:background="@drawable/shape_patient_bg">
-        <TextView
+        <com.wdkl.callingbed2.util.MarqueeText
             android:id="@+id/view_main_layout_tv_patient_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="40dp"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:singleLine="true"
             android:text="张小米"
             android:textColor="#3CA2E0"
             android:textSize="120sp"