修改分机显示界面，已确认

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -655,26 +655,36 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
                     //隐藏护理名称
                     tv_nurse_config_name1.visibility = View.GONE
                     tv_nurse_config_value1.textSize = 36f
+                    tv_nurse_config_value1.gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT
                     tv_nurse_config_name2.visibility = View.GONE
                     tv_nurse_config_value2.textSize = 36f
+                    tv_nurse_config_value2.gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT
                     tv_nurse_config_name3.visibility = View.GONE
                     tv_nurse_config_value3.textSize = 36f
+                    tv_nurse_config_value3.gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT
                     tv_nurse_config_name4.visibility = View.GONE
                     tv_nurse_config_value4.textSize = 36f
+                    tv_nurse_config_value4.gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT
                     tv_nurse_config_name5.visibility = View.GONE
                     tv_nurse_config_value5.textSize = 36f
+                    tv_nurse_config_value5.gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT
                 } else {
                     //显示护理名称
                     tv_nurse_config_name1.visibility = View.VISIBLE
                     tv_nurse_config_value1.textSize = 28f
+                    tv_nurse_config_value1.gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
                     tv_nurse_config_name2.visibility = View.VISIBLE
                     tv_nurse_config_value2.textSize = 28f
+                    tv_nurse_config_value2.gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
                     tv_nurse_config_name3.visibility = View.VISIBLE
                     tv_nurse_config_value3.textSize = 28f
+                    tv_nurse_config_value3.gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
                     tv_nurse_config_name4.visibility = View.VISIBLE
                     tv_nurse_config_value4.textSize = 28f
+                    tv_nurse_config_value4.gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
                     tv_nurse_config_name5.visibility = View.VISIBLE
                     tv_nurse_config_value5.textSize = 28f
+                    tv_nurse_config_value5.gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
                 }
 
                 tv_nurse_config_name1.setText(configList.get(0).nurseConfigName)

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -1,6 +1,5 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
-import android.content.Intent
 import android.graphics.Color
 import android.text.TextUtils
 import android.util.Log
@@ -10,10 +9,7 @@ import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.activity.CallingbedActivity
 import com.wdkl.app.ncs.callingbed.databinding.MainViewLayoutBinding
-import com.wdkl.app.ncs.callingbed.helper.SerialPortHelper
 import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
-import com.wdkl.app.ncs.callingbed.net.NettyClient
-//import com.wdkl.app.ncs.sip.activity.VoipAudioActivity
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.lib.vo.filter
@@ -48,7 +44,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
     }
 
     override fun bindEvent() {
-        debugLog(TAG,"bindEvent")
+        //debugLog(TAG,"bindEvent")
     }
 
     override fun onStart() {
@@ -62,7 +58,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
     }
 
     override fun destory() {
-        debugLog(TAG,"destory")
+        //debugLog(TAG,"destory")
     }
 
     override fun showCustomInfo(customInfo: CustomerInfoVO) {
@@ -139,7 +135,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
     }
 
     override fun onError(message: String, type: Int) {
-        errorLog("error",message)
+        //errorLog("error",message)
         showMessage(message)
     }
 

callingbed/src/main/res/layout/callingbed_main_lay.xml

@@ -47,7 +47,7 @@
                     android:id="@+id/tv_nurse_config_value1"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical|right"
                     android:ellipsize="marquee"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
@@ -80,7 +80,7 @@
                     android:id="@+id/tv_nurse_config_value2"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical|right"
                     android:ellipsize="marquee"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
@@ -113,7 +113,7 @@
                     android:id="@+id/tv_nurse_config_value3"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical|right"
                     android:ellipsize="marquee"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
@@ -146,7 +146,7 @@
                     android:id="@+id/tv_nurse_config_value4"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical|right"
                     android:ellipsize="marquee"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
@@ -179,7 +179,7 @@
                     android:id="@+id/tv_nurse_config_value5"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical|right"
                     android:ellipsize="marquee"
                     android:focusable="true"
                     android:focusableInTouchMode="true"

callingbed/src/main/res/layout/main_view.xml

@@ -255,8 +255,8 @@
                     android:id="@+id/tv_custom_name"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_toLeftOf="@+id/main_view_qr_code"
-                    android:textSize="96sp"
+                    android:layout_toLeftOf="@id/ll_custom_age_gender"
+                    android:textSize="120sp"
                     android:textStyle="bold"
                     android:textColor="@color/black"
                     android:text="---"
@@ -265,63 +265,50 @@
                     android:focusableInTouchMode="true"
                     android:marqueeRepeatLimit="-1"
                     android:singleLine="true"/>
-                <TextView
-                    android:id="@+id/tv_custom_gender"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tv_custom_name"
-                    android:layout_marginLeft="4dp"
-                    android:textSize="28sp"
-                    android:textColor="@color/black"/>
-                <TextView
-                    android:id="@+id/tv_custom_age"
+                <LinearLayout
+                    android:id="@+id/ll_custom_age_gender"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tv_custom_name"
-                    android:layout_toRightOf="@id/tv_custom_gender"
-                    android:layout_marginLeft="10dp"
-                    android:textSize="28sp"
-                    android:textColor="@color/black"
-                    android:text="--"/>
+                    android:layout_height="140dp"
+                    android:layout_marginRight="6dp"
+                    android:layout_marginLeft="6dp"
+                    android:layout_alignParentRight="true"
+                    android:gravity="bottom"
+                    android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/tv_custom_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="44sp"
+                        android:textColor="@color/black"/>
+                    <TextView
+                        android:id="@+id/tv_custom_age"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="40sp"
+                        android:textColor="@color/black"
+                        android:text="-"/>
+                </LinearLayout>
                 <TextView
                     android:id="@+id/tv_custom_indate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/tv_custom_gender"
-                    android:layout_marginTop="6dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="6dp"
                     android:layout_marginLeft="4dp"
-                    android:textSize="22sp"
+                    android:textSize="24sp"
                     android:textColor="@color/black"
                     android:text="@string/indate"/>
                 <TextView
                     android:id="@+id/tv_custom_card_no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/tv_custom_gender"
+                    android:layout_alignParentBottom="true"
                     android:layout_alignParentRight="true"
-                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="6dp"
                     android:layout_marginRight="4dp"
-                    android:textSize="22sp"
+                    android:textSize="24sp"
                     android:textColor="@color/black"
                     android:text=""/>
-
-                <ImageView
-                    android:id="@+id/main_view_qr_code"
-                    android:layout_width="168dp"
-                    android:layout_height="168dp"
-                    android:layout_toLeftOf="@+id/tv_qr_code_title"
-                    android:visibility="gone"/>
-                <TextView
-                    android:id="@+id/tv_qr_code_title"
-                    android:layout_width="24dp"
-                    android:layout_height="168dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="-4dp"
-                    android:gravity="center"
-                    android:text="便民服务"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:visibility="gone"/>
             </RelativeLayout>
         </FrameLayout>
 

callingbed/src/main/res/layout/view_bed_name_home.xml

@@ -1,44 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="200dp"
     android:background="@color/white">
 
-    <RelativeLayout
+    <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+        android:id="@+id/tv_home_bed_name"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="-16dp"
-        tools:ignore="UselessParent">
-        <com.wdkl.ncs.android.lib.widget.MarqueeTextView
-            android:id="@+id/tv_home_bed_name"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/tv_home_version"
-            android:gravity="center_horizontal"
-            android:textColor="@color/black"
-            android:textSize="168sp"
-            android:textStyle="bold"
-            android:text="--"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:marqueeRepeatLimit="-1"
-            android:singleLine="true"/>
+        android:layout_marginTop="-10dp"
+        android:layout_above="@id/tv_home_version"
+        android:layout_toLeftOf="@+id/main_view_qr_code"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:gravity="center_horizontal"
+        android:marqueeRepeatLimit="-1"
+        android:singleLine="true"
+        android:text="--"
+        android:textColor="@color/black"
+        android:textSize="164sp"
+        android:textStyle="bold" />
 
-        <TextView
-            android:id="@+id/tv_home_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:paddingLeft="6dp"
-            android:paddingRight="6dp"
-            android:gravity="bottom"
-            android:textColor="@color/black"
-            android:textSize="16sp"
-            android:text="v--"/>
-    </RelativeLayout>
+    <ImageView
+        android:id="@+id/main_view_qr_code"
+        android:layout_width="168dp"
+        android:layout_height="168dp"
+        android:layout_marginTop="10dp"
+        android:layout_toLeftOf="@+id/tv_qr_code_title"
+        android:visibility="gone" />
 
-</LinearLayout>
+    <TextView
+        android:id="@+id/tv_qr_code_title"
+        android:layout_width="24dp"
+        android:layout_height="168dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="10dp"
+        android:gravity="center"
+        android:text="便民服务"
+        android:textColor="@color/main_color"
+        android:textSize="20sp"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/tv_home_version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="24dp"
+        android:paddingLeft="6dp"
+        android:paddingRight="6dp"
+        android:text="v--"
+        android:textColor="@color/black"
+        android:textSize="16sp" />
+
+</RelativeLayout>