根据客户要求调整7寸分机界面显示

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

@@ -19,7 +19,7 @@ import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
 import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
-import com.wdkl.app.ncs.callingbed.adapter.NurseConfigAdpter
+import com.wdkl.app.ncs.callingbed.adapter.NurseConfigAdapter
 import com.wdkl.app.ncs.callingbed.agreement.CallingbedAgreement
 import com.wdkl.app.ncs.callingbed.databinding.Callingbed2MainLayBinding
 import com.wdkl.app.ncs.callingbed.fragment.*
@@ -102,7 +102,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
     private var skyCallFragment: Fragment? = null
 
     private lateinit var linearLayout : LinearLayoutManager
-    private lateinit var nurseConfigAdpter : NurseConfigAdpter
+    private lateinit var nurseConfigAdapter : NurseConfigAdapter
     private var configList = ArrayList<NurseConfigDto>()
 
     private var initialized :Boolean = false
@@ -582,9 +582,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
         }
 
         linearLayout = LinearLayoutManager(activity)
-        nurseConfigAdpter = NurseConfigAdpter(activity, configList)
+        nurseConfigAdapter = NurseConfigAdapter(activity, configList)
         rv_left_list.layoutManager = linearLayout
-        rv_left_list.adapter = nurseConfigAdpter
+        rv_left_list.adapter = nurseConfigAdapter
     }
 
     override fun updateNurseConfig(list: List<NurseConfigDto>) {
@@ -596,7 +596,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
                     configList.add(e)
                 }*/
             }
-            nurseConfigAdpter.updateData(configList)
+            nurseConfigAdapter.updateData(configList)
         }
     }
 

android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/adapter/NurseConfigAdpter.kt

@@ -12,7 +12,7 @@ import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
 import java.lang.Exception
 
-class NurseConfigAdpter : RecyclerView.Adapter<NurseConfigAdpter.ViewHolder> {
+class NurseConfigAdapter : RecyclerView.Adapter<NurseConfigAdapter.ViewHolder> {
     private var context: Context
     private var data: ArrayList<NurseConfigDto>
 

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

@@ -61,10 +61,13 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainView2LayoutBinding>(
         //显示入住信息
         tv_custom_name.text = customInfo.named
         if (customInfo.sex == 0) {
-            tv_custom_gender.setBackgroundResource(R.mipmap.ic_gender_female)
+            //tv_custom_gender.setBackgroundResource(R.mipmap.ic_gender_female)
+            tv_custom_gender.setText(R.string.str_female)
         } else if (customInfo.sex == 1) {
-            tv_custom_gender.setBackgroundResource(R.mipmap.ic_gender_male)
+            //tv_custom_gender.setBackgroundResource(R.mipmap.ic_gender_male)
+            tv_custom_gender.setText(R.string.str_male)
         }
+
         tv_custom_age.text = "" + customInfo.age + customInfo.ageUnit
         if (customInfo.inDate != null) {
             tv_custom_indate.text = StringUtil.getResString(R.string.indate) + TimeHandle.getDateTime(customInfo.inDate * 1000, "yyyy.MM.dd")

android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/fragment/QrCodeFragment.kt

@@ -76,7 +76,7 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
             builder.append(Constant.DEVICE_TYPE)
             builder.append("&device_name=")
             builder.append(Constant.DEVICE_NAME)
-            val code = EcodeHelper().createQRImage(builder.toString(),200, null)
+            val code = EcodeHelper().createQRImage(builder.toString(),180, null)
             activity.runOnUiThread {
                 view_qr_code?.setImageBitmap(code)
             }

android_bed/src/main/h7_3128/res/layout/item_nurse_config.xml

@@ -6,39 +6,36 @@
     android:layout_height="86dp"
     android:layout_marginTop="6dp"
     android:background="#E7E7E7"
-    android:orientation="vertical">
-
-    <!--<TextView
-        android:id="@+id/tv_nurse_color"
-        android:layout_width="8dp"
-        android:layout_height="match_parent"
-        android:background="@color/main_color"/>-->
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/tv_nurse_config_name"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
         android:layout_weight="1"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp"
-        android:singleLine="true"
+        android:paddingLeft="4dp"
+        android:paddingTop="10dp"
+        android:maxLines="2"
         android:ellipsize="end"
         android:text="@string/default_nurse_config_name"
-        android:textSize="20sp"
+        android:textSize="22sp"
         android:textColor="@color/white"/>
 
-    <TextView
+    <com.wdkl.ncs.android.lib.widget.MarqueeTextView
         android:id="@+id/tv_nurse_config_value"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="2"
         android:paddingRight="6dp"
         android:paddingBottom="6dp"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:marqueeRepeatLimit="-1"
         android:singleLine="true"
-        android:ellipsize="end"
-        android:gravity="right|bottom"
+        android:gravity="center"
         android:text="@string/str_empty"
-        android:textSize="22sp"
+        android:textSize="34sp"
         android:textColor="@color/white"/>
 
 </LinearLayout>

android_bed/src/main/h7_3128/res/layout/main_view2_layout.xml

@@ -23,30 +23,31 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:gravity="center_horizontal"
+            android:gravity="center"
             android:orientation="vertical"
             android:background="@color/white">
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:src="@mipmap/ic_doctor_default"/>
-            <TextView
-                android:id="@+id/tv_doctor_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textColor="#B4B4B4"
-                android:textSize="18sp"
-                android:text="@string/doctor_title"/>
+                android:src="@mipmap/ic_doctor_default"
+                android:visibility="gone"/>
             <TextView
                 android:id="@+id/tv_doctor_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:textColor="@color/black"
-                android:textSize="18sp"
+                android:textSize="40sp"
                 android:text="@string/str_empty"/>
+            <TextView
+                android:id="@+id/tv_doctor_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:textColor="#B4B4B4"
+                android:textSize="24sp"
+                android:text="@string/doctor_title"/>
         </LinearLayout>
 
         <!--责任护士-->
@@ -56,30 +57,31 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:layout_marginTop="10dp"
-            android:gravity="center_horizontal"
+            android:gravity="center"
             android:orientation="vertical"
             android:background="@color/white">
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:src="@mipmap/ic_nurse_default"/>
-            <TextView
-                android:id="@+id/tv_nurse_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textColor="#B4B4B4"
-                android:textSize="18sp"
-                android:text="@string/nurse_title"/>
+                android:src="@mipmap/ic_nurse_default"
+                android:visibility="gone"/>
             <TextView
                 android:id="@+id/tv_nurse_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:textColor="@color/black"
-                android:textSize="18sp"
+                android:textSize="40sp"
                 android:text="@string/str_empty"/>
+            <TextView
+                android:id="@+id/tv_nurse_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:textColor="#B4B4B4"
+                android:textSize="24sp"
+                android:text="@string/nurse_title"/>
         </LinearLayout>
     </LinearLayout>
 
@@ -122,10 +124,7 @@
             android:id="@+id/ll_custom_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="4dp"
-            android:paddingBottom="4dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
+            android:padding="4dp"
             android:background="@color/white"
             android:orientation="vertical"
             android:visibility="gone">
@@ -143,32 +142,35 @@
                     android:layout_width="186dp"
                     android:layout_height="match_parent"
                     android:background="#E7E7E7"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
                     <TextView
                         android:id="@+id/tv_nurse_name6"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:paddingLeft="6dp"
-                        android:paddingTop="6dp"
-                        android:singleLine="true"
+                        android:paddingLeft="4dp"
+                        android:paddingTop="10dp"
+                        android:maxLines="2"
                         android:ellipsize="end"
                         android:text="@string/default_nurse_config_name"
-                        android:textSize="20sp"
+                        android:textSize="22sp"
                         android:textColor="@color/white"/>
 
-                    <TextView
+                    <com.wdkl.ncs.android.lib.widget.MarqueeTextView
                         android:id="@+id/tv_nurse_value6"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="2"
                         android:paddingRight="6dp"
                         android:paddingBottom="6dp"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:marqueeRepeatLimit="-1"
                         android:singleLine="true"
-                        android:ellipsize="end"
-                        android:gravity="right|bottom"
+                        android:gravity="center"
                         android:text="@string/str_empty"
-                        android:textSize="22sp"
+                        android:textSize="34sp"
                         android:textColor="@color/white"/>
                 </LinearLayout>
 
@@ -178,32 +180,35 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="10dp"
                     android:background="#E7E7E7"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
                     <TextView
                         android:id="@+id/tv_nurse_name7"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:paddingLeft="6dp"
-                        android:paddingTop="6dp"
-                        android:singleLine="true"
+                        android:paddingLeft="4dp"
+                        android:paddingTop="10dp"
+                        android:maxLines="2"
                         android:ellipsize="end"
                         android:text="@string/default_nurse_config_name"
-                        android:textSize="20sp"
+                        android:textSize="22sp"
                         android:textColor="@color/white"/>
 
-                    <TextView
+                    <com.wdkl.ncs.android.lib.widget.MarqueeTextView
                         android:id="@+id/tv_nurse_value7"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="2"
                         android:paddingRight="6dp"
                         android:paddingBottom="6dp"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:marqueeRepeatLimit="-1"
                         android:singleLine="true"
-                        android:ellipsize="end"
-                        android:gravity="right|bottom"
+                        android:gravity="center"
                         android:text="@string/str_empty"
-                        android:textSize="22sp"
+                        android:textSize="34sp"
                         android:textColor="@color/white"/>
                 </LinearLayout>
 
@@ -213,76 +218,93 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="10dp"
                     android:background="#E7E7E7"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
                     <TextView
                         android:id="@+id/tv_nurse_name8"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:paddingLeft="6dp"
-                        android:paddingTop="6dp"
-                        android:singleLine="true"
+                        android:paddingLeft="4dp"
+                        android:paddingTop="10dp"
+                        android:maxLines="2"
                         android:ellipsize="end"
                         android:text="@string/default_nurse_config_name"
-                        android:textSize="20sp"
+                        android:textSize="22sp"
                         android:textColor="@color/white"/>
 
-                    <TextView
+                    <com.wdkl.ncs.android.lib.widget.MarqueeTextView
                         android:id="@+id/tv_nurse_value8"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="2"
                         android:paddingRight="6dp"
                         android:paddingBottom="6dp"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:marqueeRepeatLimit="-1"
                         android:singleLine="true"
-                        android:ellipsize="end"
-                        android:gravity="right|bottom"
+                        android:gravity="center"
                         android:text="@string/str_empty"
-                        android:textSize="22sp"
+                        android:textSize="34sp"
                         android:textColor="@color/white"/>
                 </LinearLayout>
             </LinearLayout>
 
-            <TextView
+            <com.wdkl.ncs.android.lib.widget.MarqueeTextView
                 android:id="@+id/tv_custom_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="88sp"
+                android:layout_width="380dp"
+                android:layout_height="match_parent"
+                android:layout_above="@id/ll_nurse_more"
+                android:paddingLeft="4dp"
+                android:paddingRight="4dp"
+                android:gravity="center"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="-1"
+                android:singleLine="true"
+                android:textSize="120sp"
                 android:textColor="@color/main_color"
                 android:textStyle="bold"
                 android:text="---"/>
-            <TextView
-                android:id="@+id/tv_custom_gender"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/tv_custom_name"
-                android:layout_alignBottom="@id/tv_custom_name"
-                android:background="@mipmap/ic_gender_male"
-                android:layout_marginLeft="20dp"
-                android:layout_marginBottom="10dp"/>
-            <TextView
-                android:id="@+id/tv_custom_age"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/tv_custom_gender"
-                android:layout_alignBottom="@id/tv_custom_name"
-                android:layout_marginLeft="20dp"
-                android:textSize="40sp"
-                android:textColor="#B4B4B4"
-                android:text="--"/>
 
             <LinearLayout
                 android:id="@+id/ll_custom_no"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_below="@id/tv_custom_name">
+                android:layout_height="match_parent"
+                android:layout_above="@id/ll_nurse_more"
+                android:layout_toRightOf="@id/tv_custom_name"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:paddingLeft="8dp"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:id="@+id/tv_custom_age"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="28sp"
+                        android:text="--"/>
+                    <TextView
+                        android:id="@+id/tv_custom_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:textSize="28sp"
+                        android:text="-"/>
+                </LinearLayout>
 
                 <TextView
                     android:id="@+id/tv_custom_indate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="24sp"
+                    android:layout_marginTop="10dp"
+                    android:textSize="20sp"
                     android:textColor="#131313"
                     android:text="@string/indate"/>
 
@@ -290,8 +312,8 @@
                     android:id="@+id/tv_custom_card_no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="40dp"
-                    android:textSize="24sp"
+                    android:layout_marginTop="10dp"
+                    android:textSize="20sp"
                     android:textColor="#131313"
                     android:text=""/>
             </LinearLayout>
@@ -323,7 +345,8 @@
                 android:textSize="20sp"
                 android:textColor="#131313"
                 android:text="@string/str_empty"
-                android:lineSpacingExtra="12dp"/>
+                android:lineSpacingExtra="12dp"
+                android:visibility="gone"/>
         </RelativeLayout>
     </FrameLayout>
 

android_bed/src/main/h7_3128/res/layout/qr_code_lay.xml

@@ -10,18 +10,18 @@
 
     <LinearLayout
         android:id="@+id/ll_qr_code_view"
-        android:layout_width="420dp"
+        android:layout_width="500dp"
         android:layout_height="match_parent"
         android:layout_below="@id/lay_qr_bed_name"
         android:layout_marginTop="6dp"
         android:layout_marginBottom="6dp"
+        android:gravity="center_vertical"
         android:background="@color/white"
-        android:orientation="vertical">
+        android:orientation="horizontal">
         <ImageView
             android:id="@+id/view_qr_code"
-            android:layout_width="200dp"
-            android:layout_height="200dp"
-            android:layout_gravity="center_horizontal"/>
+            android:layout_width="180dp"
+            android:layout_height="180dp" />
 
         <ScrollView
             android:layout_width="match_parent"
@@ -110,8 +110,7 @@
         <ScrollView
             android:id="@+id/device_action_view"
             android:layout_width="match_parent"
-            android:layout_height="160dp"
-            android:layout_alignParentBottom="true">
+            android:layout_height="match_parent">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -122,72 +121,73 @@
                     android:id="@+id/tv_btn_screen_off"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
                     android:background="@color/main_color"
                     android:gravity="center_horizontal"
                     android:padding="10dp"
                     android:text="@string/screen_off"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="24sp" />
 
                 <TextView
-                    android:id="@+id/tv_btn_reboot"
+                    android:id="@+id/tv_btn_update_app"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="20dp"
                     android:background="@color/main_color"
                     android:gravity="center_horizontal"
                     android:padding="10dp"
-                    android:text="@string/reboot_device"
+                    android:text="@string/check_update"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="24sp" />
 
                 <TextView
-                    android:id="@+id/tv_btn_update_app"
+                    android:id="@+id/tv_btn_reboot"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="20dp"
                     android:background="@color/main_color"
                     android:gravity="center_horizontal"
                     android:padding="10dp"
-                    android:text="@string/check_update"
+                    android:text="@string/reboot_device"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="24sp" />
 
                 <TextView
                     android:id="@+id/tv_btn_language_setting"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="20dp"
                     android:background="@color/main_color"
                     android:gravity="center_horizontal"
                     android:padding="10dp"
                     android:text="@string/language_set_title"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="24sp" />
 
                 <TextView
                     android:id="@+id/tv_btn_server_config"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="20dp"
                     android:background="@color/main_color"
                     android:gravity="center_horizontal"
                     android:padding="10dp"
                     android:text="@string/server_config"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="24sp" />
 
                 <TextView
                     android:id="@+id/tv_device_test"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="20dp"
                     android:background="@color/main_color"
                     android:gravity="center_horizontal"
                     android:padding="10dp"
                     android:text="@string/test_mode"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="24sp" />
             </LinearLayout>
         </ScrollView>
 
@@ -197,7 +197,8 @@
             android:layout_height="wrap_content"
             android:text="@string/product_desc"
             android:textColor="@color/black"
-            android:textSize="22sp" />
+            android:textSize="22sp"
+            android:visibility="gone"/>
 
         <TextView
             android:id="@+id/tv_about_me"
@@ -209,7 +210,8 @@
             android:layout_marginBottom="10dp"
             android:text="@string/str_empty"
             android:textColor="#949494"
-            android:textSize="20sp" />
+            android:textSize="20sp"
+            android:visibility="gone"/>
     </RelativeLayout>
 
     <!--camera预览-->

android_bed/src/main/h7_3128/res/layout/view_bed_name.xml

@@ -2,18 +2,25 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="120dp">
+    android:layout_height="188dp">
 
-    <TextView
+    <com.wdkl.ncs.android.lib.widget.MarqueeTextView
         android:id="@+id/tv_bed_name"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
+        android:layout_marginTop="-10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
         android:background="@color/white"
-        android:paddingLeft="20dp"
-        android:gravity="center_vertical"
+        android:gravity="center"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:marqueeRepeatLimit="-1"
+        android:singleLine="true"
         android:textColor="@color/main_color"
-        android:textSize="100sp"
+        android:textSize="160sp"
         android:textStyle="bold"
         android:text="--"/>
 
@@ -25,6 +32,6 @@
         android:background="@color/white"
         android:gravity="bottom"
         android:textColor="@color/black"
-        android:textSize="16sp"
+        android:textSize="18sp"
         android:text="v--"/>
 </LinearLayout>

common/src/main/code/com/wdkl/ncs/android/lib/utils/EcodeHelper.kt

@@ -33,7 +33,7 @@ class EcodeHelper {
             //容错级别
             hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H)
             //设置空白边距的宽度
-            // hints.put(EncodeHintType.MARGIN, 2); //default is 4
+            hints.put(EncodeHintType.MARGIN, 1) //default is 4
 
             // 图像数据转换，使用了矩阵转换
             val bitMatrix = QRCodeWriter().encode(content, BarcodeFormat.QR_CODE, heightPix, heightPix, hints)

resource/src/main/res/values-es/strings.xml

@@ -94,6 +94,8 @@
     <string name="str_call_handoff">Handoff</string>
     <string name="str_call_speaker">Speaker</string>
 
+    <string name="str_male">hombre</string>
+    <string name="str_female">mujer</string>
     <string name="card_no">Card No. </string>
     <string name="indate">Fecha de entrada: </string>
     <string name="subtotal">Subtotal: </string>

resource/src/main/res/values-ru/strings.xml

@@ -91,6 +91,9 @@
     <string name="str_call_mute">Отключить звук</string>
     <string name="str_call_handoff">Переключение</string>
     <string name="str_call_speaker">Динамик</string>
+
+    <string name="str_male">мужчина</string>
+    <string name="str_female">женщина</string>
     <string name="card_no">Card No. </string>
     <string name="indate">Дата:</string>
     <string name="subtotal">Итого:</string>

resource/src/main/res/values-zh/strings.xml

@@ -94,6 +94,8 @@
     <string name="str_call_handoff">挂断</string>
     <string name="str_call_speaker">免提</string>
 
+    <string name="str_male">男</string>
+    <string name="str_female">女</string>
     <string name="card_no">住院号: </string>
     <string name="indate">入院日期: </string>
     <string name="subtotal">小计: </string>

resource/src/main/res/values/strings.xml

@@ -94,6 +94,8 @@
     <string name="str_call_handoff">Handoff</string>
     <string name="str_call_speaker">Speaker</string>
 
+    <string name="str_male">Male</string>
+    <string name="str_female">Female</string>
     <string name="card_no">Card No. </string>
     <string name="indate">In date: </string>
     <string name="subtotal">Subtotal: </string>