Browse Source

<修改护理项显示,最多显示3行12个字>

weizhengliang 4 years ago
parent
commit
347600dd83

+ 2 - 2
app/src/main/java/com/wdkl/callingbed2/util/SipUtil/SipHelperUtil.java

@@ -45,7 +45,7 @@ public class SipHelperUtil implements EthernetWifiCallBackI {
     /**
     /**
      * Sip启动注册.
      * Sip启动注册.
      */
      */
-    protected int mSipRegisterTime = 3000;
+    protected int mSipRegisterTime = 10000;
     private Handler sipRegisterHandler = null;
     private Handler sipRegisterHandler = null;
     private Runnable sipRegisterRunnable = null;
     private Runnable sipRegisterRunnable = null;
 
 
@@ -114,7 +114,7 @@ public class SipHelperUtil implements EthernetWifiCallBackI {
 
 
         IVvsipService sipservice = VvsipService.getService();
         IVvsipService sipservice = VvsipService.getService();
         if (sipservice != null) {
         if (sipservice != null) {
-            sipRegisterHandler.postDelayed(sipRegisterRunnable, 0);
+            sipRegisterHandler.postDelayed(sipRegisterRunnable, 5000);
             return;
             return;
         }
         }
         sipRegisterHandler.postDelayed(sipRegisterRunnable, mSipRegisterTime);
         sipRegisterHandler.postDelayed(sipRegisterRunnable, mSipRegisterTime);

+ 41 - 21
app/src/main/res/layout/view_main_layout2.xml

@@ -8,7 +8,7 @@
     <!--左侧护理数据-->
     <!--左侧护理数据-->
     <LinearLayout
     <LinearLayout
         android:id="@+id/activity_calling_bed_layout_ll_left"
         android:id="@+id/activity_calling_bed_layout_ll_left"
-        android:layout_width="290dp"
+        android:layout_width="300dp"
         android:layout_height="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
         android:orientation="vertical">
 
 
@@ -23,19 +23,23 @@
 
 
             <TextView
             <TextView
                 android:id="@+id/view_main_layout_left_one_title"
                 android:id="@+id/view_main_layout_left_one_title"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/margin_to_side_20"
+                android:layout_marginLeft="@dimen/margin_to_side_5"
                 android:text="--"
                 android:text="--"
+                android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/white"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_nurse_level" />
                 android:textSize="@dimen/font_size_nurse_level" />
 
 
             <TextView
             <TextView
                 android:id="@+id/view_main_layout_left_one_content"
                 android:id="@+id/view_main_layout_left_one_content"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/margin_to_side_10"
+                android:gravity="center"
                 android:text="--"
                 android:text="--"
+                android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/white"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_nurse_level" />
                 android:textSize="@dimen/font_size_nurse_level" />
 
 
@@ -53,19 +57,23 @@
 
 
             <TextView
             <TextView
                 android:id="@+id/view_main_layout_left_two_title"
                 android:id="@+id/view_main_layout_left_two_title"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/margin_to_side_20"
+                android:layout_marginLeft="@dimen/margin_to_side_5"
                 android:text="--"
                 android:text="--"
+                android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/white"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_nurse_level" />
                 android:textSize="@dimen/font_size_nurse_level" />
 
 
             <TextView
             <TextView
                 android:id="@+id/view_main_layout_left_two_content"
                 android:id="@+id/view_main_layout_left_two_content"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/margin_to_side_10"
+                android:gravity="center"
                 android:text="--"
                 android:text="--"
+                android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/white"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_nurse_level" />
                 android:textSize="@dimen/font_size_nurse_level" />
         </LinearLayout>
         </LinearLayout>
@@ -82,19 +90,23 @@
 
 
             <TextView
             <TextView
                 android:id="@+id/view_main_layout_left_three_title"
                 android:id="@+id/view_main_layout_left_three_title"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/margin_to_side_20"
+                android:layout_marginLeft="@dimen/margin_to_side_5"
                 android:text="--"
                 android:text="--"
+                android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/white"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_nurse_level" />
                 android:textSize="@dimen/font_size_nurse_level" />
 
 
             <TextView
             <TextView
                 android:id="@+id/view_main_layout_left_three_content"
                 android:id="@+id/view_main_layout_left_three_content"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/margin_to_side_10"
+                android:gravity="center"
                 android:text="--"
                 android:text="--"
+                android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/white"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_nurse_level" />
                 android:textSize="@dimen/font_size_nurse_level" />
         </LinearLayout>
         </LinearLayout>
@@ -111,19 +123,23 @@
 
 
             <TextView
             <TextView
                 android:id="@+id/view_main_layout_left_four_title"
                 android:id="@+id/view_main_layout_left_four_title"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/margin_to_side_20"
+                android:layout_marginLeft="@dimen/margin_to_side_5"
                 android:text="--"
                 android:text="--"
+                android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/white"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_nurse_level" />
                 android:textSize="@dimen/font_size_nurse_level" />
 
 
             <TextView
             <TextView
                 android:id="@+id/view_main_layout_left_four_content"
                 android:id="@+id/view_main_layout_left_four_content"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/margin_to_side_10"
+                android:gravity="center"
                 android:text="--"
                 android:text="--"
+                android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/white"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_nurse_level" />
                 android:textSize="@dimen/font_size_nurse_level" />
         </LinearLayout>
         </LinearLayout>
@@ -140,19 +156,23 @@
 
 
             <TextView
             <TextView
                 android:id="@+id/view_main_layout_left_five_title"
                 android:id="@+id/view_main_layout_left_five_title"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/margin_to_side_20"
+                android:layout_marginLeft="@dimen/margin_to_side_5"
                 android:text="--"
                 android:text="--"
+                android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/white"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_nurse_level" />
                 android:textSize="@dimen/font_size_nurse_level" />
 
 
             <TextView
             <TextView
                 android:id="@+id/view_main_layout_left_five_content"
                 android:id="@+id/view_main_layout_left_five_content"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/margin_to_side_10"
+                android:gravity="center"
                 android:text="--"
                 android:text="--"
+                android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/white"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_nurse_level" />
                 android:textSize="@dimen/font_size_nurse_level" />
         </LinearLayout>
         </LinearLayout>

+ 1 - 1
app/src/main/res/values/dimens.xml

@@ -78,6 +78,6 @@
     <dimen name="font_size_65">65sp</dimen>
     <dimen name="font_size_65">65sp</dimen>
     <dimen name="font_size_70">70sp</dimen>
     <dimen name="font_size_70">70sp</dimen>
 
 
-    <dimen name="font_size_nurse_level">40sp</dimen>
+    <dimen name="font_size_nurse_level">34sp</dimen>
 
 
 </resources>
 </resources>