调整门口机界面

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -602,6 +602,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
 
             Constant.callNums = 0
             DoorLightHelper.resetDoorLight()
+            EventBus.getDefault().post(MessageEvent("clear_calls", Constant.EVENT_CLEAR_CALLS))
 
             SpeechUtil.getInstance().stopSpeak()
             bedCalls.clear()
@@ -1408,7 +1409,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                     if ("rk3288".equals(Build.MODEL)) {
                         textView.textSize = 48f
                     } else {
-                        textView.textSize = 32f
+                        textView.textSize = 40f
                     }
                     textView.gravity = (Gravity.END or Gravity.CENTER)
                     //textView.getPaint().setFlags(mFlags);//字体划线

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/adapter/FrameRoomAdapter.kt

@@ -10,10 +10,14 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.animation.AlphaAnimation
+import android.view.animation.Animation
+import android.view.animation.LinearInterpolator
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.wdkl.app.ncs.callingdoor.R
+import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
 import com.wdkl.ncs.android.middleware.model.vo.FrameBedVO
@@ -25,6 +29,7 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
     private var context: Context
     private var data: ArrayList<FrameBedVO>
     private var configList = ArrayList<NurseConfigDto>()
+    private var flickBedNames = ArrayList<String>()
 
     private var drawableMale: Drawable
     private var drawableFemale: Drawable
@@ -117,17 +122,31 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
     }
 
     private fun showBedInfo(holder: BedViewHolder, bedVO: FrameBedVO) {
-        holder.bedName.text = CommonUtils.subStringAfter(bedVO.frameBed.fullName, "-")
+        val name = CommonUtils.subStringAfter(bedVO.frameBed.fullName, "-")
+        holder.bedName.text = name
         if (TextUtils.isEmpty(bedVO.cardNo)) {
             holder.cardNo.text = ""
         } else {
             holder.cardNo.text = StringUtil.getResString(R.string.card_no) + bedVO.cardNo
         }
 
+        //检查是否有呼叫，更新背景动画效果
+        if (flickBedNames.contains(name)) {
+            Log.e("showBed", "show animator: $name")
+            holder.bedItem.setBackgroundResource(R.color.bed_light_color)
+            holder.bedName.setTextColor(Color.parseColor("#FFFD3B30"))
+            startAnimator(holder.bedName)
+        } else {
+            Log.e("showBed", "clear animator: $name")
+            holder.bedItem.setBackgroundResource(R.color.white)
+            holder.bedName.setTextColor(Color.parseColor("#2F9DF1"))
+            clearAnimator(holder.bedName)
+        }
+
         if (TextUtils.isEmpty(bedVO.customerName)) {
             //空床位
             holder.customName.setText(R.string.str_empty)
-            holder.customName.setCompoundDrawables(null, drawableEmpty, null, null)
+            holder.customName.setCompoundDrawables(drawableEmpty, null, null, null)
             holder.customAge.visibility = View.GONE
             holder.doctorIcon.visibility = View.GONE
             holder.doctorTitle.visibility = View.GONE
@@ -138,18 +157,21 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
         } else {
             //有入住
             holder.customName.text = bedVO.customerName
-            holder.customName.setCompoundDrawables(null, drawableEmpty, null, null)
+            holder.customName.setCompoundDrawables(drawableEmpty, null, null, null)
             holder.customAge.visibility = View.VISIBLE
-            holder.customAge.text = "" + bedVO.customerAge + bedVO.customerAgeUnit
+            //holder.customAge.text = "" + bedVO.customerAge + bedVO.customerAgeUnit
             if (bedVO.customerSex == 0) {
-                holder.customName.setCompoundDrawables(null, drawableFemale, null, null)
-                holder.customAge.setCompoundDrawables(iconFemale, null, null, null)
+                holder.customName.setCompoundDrawables(drawableFemale, null, null, null)
+                //holder.customAge.setCompoundDrawables(iconFemale, null, null, null)
+                holder.customAge.text = BaseApplication.appContext.getString(R.string.str_female) + " " + bedVO.customerAge + bedVO.customerAgeUnit
             } else if (bedVO.customerSex == 1) {
-                holder.customName.setCompoundDrawables(null, drawableMale, null, null)
-                holder.customAge.setCompoundDrawables(iconMale, null, null, null)
+                holder.customName.setCompoundDrawables(drawableMale, null, null, null)
+                //holder.customAge.setCompoundDrawables(iconMale, null, null, null)
+                holder.customAge.text = BaseApplication.appContext.getString(R.string.str_male) + " " + bedVO.customerAge + bedVO.customerAgeUnit
             } else {
-                holder.customName.setCompoundDrawables(null, drawableEmpty, null, null)
-                holder.customAge.setCompoundDrawables(null, null, null, null)
+                holder.customName.setCompoundDrawables(drawableEmpty, null, null, null)
+                //holder.customAge.setCompoundDrawables(null, null, null, null)
+                holder.customAge.text = "" + bedVO.customerAge + bedVO.customerAgeUnit
             }
             holder.doctorName.text = bedVO.doctorName
             holder.nurseName.text = bedVO.nurseName
@@ -167,21 +189,21 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
             }
 
             if (Constant.doctorValid == 1) {
-                holder.doctorIcon.visibility = View.VISIBLE
+                //holder.doctorIcon.visibility = View.VISIBLE
                 holder.doctorTitle.visibility = View.VISIBLE
                 holder.doctorName.visibility = View.VISIBLE
             } else {
-                holder.doctorIcon.visibility = View.GONE
+                //holder.doctorIcon.visibility = View.GONE
                 holder.doctorTitle.visibility = View.GONE
                 holder.doctorName.visibility = View.GONE
             }
 
             if (Constant.nurseValid == 1) {
-                holder.nurseIcon.visibility = View.VISIBLE
+                //holder.nurseIcon.visibility = View.VISIBLE
                 holder.nurseTitle.visibility = View.VISIBLE
                 holder.nurseName.visibility = View.VISIBLE
             } else {
-                holder.nurseIcon.visibility = View.GONE
+                //holder.nurseIcon.visibility = View.GONE
                 holder.nurseTitle.visibility = View.GONE
                 holder.nurseName.visibility = View.GONE
             }
@@ -199,7 +221,7 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
         }
 
 
-        if (TextUtils.isEmpty(configList[0].nurseColorRbg)) {
+        /*if (TextUtils.isEmpty(configList[0].nurseColorRbg)) {
             holder.nursingColor1.setBackgroundColor(Color.parseColor("#D7D7D7"))
         } else {
             holder.nursingColor1.setBackgroundColor(Color.parseColor("#" + configList[0].nurseColorRbg))
@@ -237,7 +259,7 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
             holder.nursingColor5.setBackgroundColor(Color.parseColor("#" + configList[4].nurseColorRbg))
         }
         holder.nursingName5.setText(configList[4].nurseConfigName)
-        holder.nursingValue5.setText(configList[4].nurseOptionName)
+        holder.nursingValue5.setText(configList[4].nurseOptionName)*/
     }
 
     private fun showBedInfoRk3288(holder: BedViewHolder, bedVO: FrameBedVO) {
@@ -364,7 +386,58 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
         holder.nursingValue5.setText(configList[4].nurseOptionName)
     }
 
+    private fun startAnimator(view: View) {
+        /*val animator: ValueAnimator = ObjectAnimator.ofInt(view, "backgroundColor", 0x22ff0000, 0x77ff0000) //对背景色颜色进行改变，操作的属性为"backgroundColor",此处必须这样写，不能全小写,后面的颜色为在对应颜色间进行渐变
+        animator.duration = 1500
+        animator.repeatCount = ValueAnimator.INFINITE //表示重复多次
+        animator.repeatMode = ValueAnimator.REVERSE //表示动画结束后，反过来再执行;RESTART表示从头开始，REVERSE表示从末尾倒播
+        animator.setEvaluator(ArgbEvaluator()) //如果要颜色渐变必须要ArgbEvaluator，来实现颜色之间的平滑变化，否则会出现颜色不规则跳动
+        animator.start()*/
+
+
+        val alphaAnimation = AlphaAnimation(1.0f, 0.1f)
+        alphaAnimation.duration = 1500
+        alphaAnimation.interpolator = LinearInterpolator()
+        alphaAnimation.repeatCount = Animation.INFINITE //表示重复多次
+        alphaAnimation.repeatMode = Animation.REVERSE //表示动画结束后，反过来再执行;RESTART表示从头开始，REVERSE表示从末尾倒播
+        view.startAnimation(alphaAnimation)
+    }
+
+    private fun clearAnimator(view: View) {
+        view.clearAnimation()
+    }
+
+    fun addFlickBedItem(name: String) {
+        synchronized(flickBedNames) {
+            flickBedNames.add(name)
+            notifyDataSetChanged()
+        }
+    }
+
+    fun removeFlickBedItem(name: String) {
+        synchronized(flickBedNames) {
+            if (flickBedNames.size > 0) {
+                val iterator = flickBedNames.iterator()
+                while (iterator.hasNext()) {
+                    val it = iterator.next()
+                    if (it == name) {
+                        iterator.remove()
+                    }
+                }
+            }
+            notifyDataSetChanged()
+        }
+    }
+
+    fun resetFlickBedItems() {
+        synchronized(flickBedNames) {
+            flickBedNames.clear()
+            notifyDataSetChanged()
+        }
+    }
+
     class BedViewHolder: RecyclerView.ViewHolder {
+        var bedItem : LinearLayout
         var bedName : TextView
         var cardNo : TextView
         var nursingColor1 : View
@@ -395,6 +468,7 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
         var nurseName : TextView
 
         constructor(itemView: View): super(itemView) {
+            bedItem = itemView.findViewById(R.id.ll_item_bed)
             bedName = itemView.findViewById(R.id.tv_bed_name_title)
             cardNo = itemView.findViewById(R.id.tv_bed_card_no)
             nursingColor1 = itemView.findViewById(R.id.nurse_config_item_color1)

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/MainFragment.kt

@@ -5,6 +5,7 @@ import android.support.v7.widget.DefaultItemAnimator
 import android.support.v7.widget.GridLayoutManager
 import android.text.TextUtils
 import com.enation.javashop.net.engine.model.NetState
+import com.google.gson.Gson
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.adapter.FrameRoomAdapter
 import com.wdkl.app.ncs.callingdoor.databinding.MainViewLayoutBinding
@@ -22,7 +23,10 @@ import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.MainFragmentCo
 import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.MainFragmentPresenter
 import com.wdkl.ncs.android.middleware.model.vo.FrameBedVO
 import com.wdkl.ncs.android.middleware.model.vo.FrameRoomVO
+import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
+import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import kotlinx.android.synthetic.main.main_view_layout.*
 import org.greenrobot.eventbus.EventBus
@@ -33,7 +37,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
     val TAG = "MainFragment"
 
     private lateinit var gridLayoutManager: OnegoGridLayoutManager
-    private lateinit var roomAdpter : FrameRoomAdapter
+    private lateinit var roomAdapter : FrameRoomAdapter
     private var bedList = ArrayList<FrameBedVO>()
 
     override fun getLayId(): Int {
@@ -50,9 +54,9 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
         } else {
             gridLayoutManager = OnegoGridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
         }
-        roomAdpter = FrameRoomAdapter(activity, bedList)
+        roomAdapter = FrameRoomAdapter(activity, bedList)
         rv_bed_view.layoutManager = gridLayoutManager
-        rv_bed_view.adapter = roomAdpter
+        rv_bed_view.adapter = roomAdapter
 
         updateInfo()
     }
@@ -69,7 +73,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
             var simulateBed = false
             bedList.clear()
             bedList.addAll(roomInfo.frameBedList)
-            roomAdpter.setData(bedList)
+            roomAdapter.setData(bedList)
             Utils.setInBedVos(bedList)
             rv_bed_view.itemAnimator = DefaultItemAnimator()
             if (bedList.size > 3) {
@@ -158,6 +162,23 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
             Constant.EVENT_UPDATE_CUSTOM -> {
                 updateInfo()
             }
+
+            Constant.EVENT_TCP_MSG -> {
+                val tcpModel = messageEvent.message as TcpModel
+                if (tcpModel.action == TcpAction.SideAction.SHOW || tcpModel.action == TcpAction.SideAction.CLEAR) {
+                    val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
+                    val bedName = CommonUtils.subStringAfter(interactionVO.fromFrameFullName, "-")
+                    if (tcpModel.action == TcpAction.SideAction.SHOW) {
+                        roomAdapter.addFlickBedItem(bedName)
+                    } else {
+                        roomAdapter.removeFlickBedItem(bedName)
+                    }
+                }
+            }
+
+            Constant.EVENT_CLEAR_CALLS -> {
+                roomAdapter.resetFlickBedItems()
+            }
         }
     }
 }

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/QrCodeFragment.kt

@@ -51,7 +51,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_door/src/main/h10_3128/res/drawable/shape_bed_item_bg.xml

@@ -0,0 +1,12 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="-2dp"
+        android:right="-2dp"
+        android:top="-2dp">
+        <shape>
+            <stroke
+                android:width="2px"
+                android:color="@color/main_color"/>
+        </shape>
+    </item>
+</layer-list>

android_door/src/main/h10_3128/res/layout/callingdoor_main_lay.xml

@@ -9,51 +9,9 @@
             android:id="@+id/activity_calling_door_layout_title"
             layout="@layout/view_title_layout"/>
 
-        <LinearLayout
-            android:id="@+id/ll_room_name"
-            android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:layout_below="@id/activity_calling_door_layout_title">
-            <com.wdkl.ncs.android.lib.widget.MarqueeTextView
-                android:id="@+id/tv_room_name"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="3"
-                android:paddingLeft="20dp"
-                android:paddingRight="20dp"
-                android:text="--"
-                android:textColor="@color/main_color"
-                android:textSize="68sp"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:focusable="true"
-                android:focusableInTouchMode="true" />
-
-            <ViewFlipper
-                android:id="@+id/view_flipper"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="2"
-                android:paddingRight="10dp"
-                android:paddingLeft="10dp"
-                android:autoStart="true"
-                android:flipInterval="5000"
-                android:inAnimation="@anim/slide_down_in"
-                android:outAnimation="@anim/slide_up_out">
-                <!--<TextView
-                    android:id="@+id/call_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center|right"
-                    android:text="09床 呼叫"
-                    android:textColor="@color/color_red"
-                    android:textSize="32sp" />-->
-            </ViewFlipper>
-        </LinearLayout>
-
         <TextView
             android:id="@+id/app_version"
-            android:layout_width="132dp"
+            android:layout_width="148dp"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
@@ -69,16 +27,16 @@
         <!--右侧按钮区域-->
         <ScrollView
             android:id="@+id/room_actions"
-            android:layout_width="132dp"
+            android:layout_width="160dp"
             android:layout_height="match_parent"
-            android:layout_below="@id/ll_room_name"
+            android:layout_marginTop="60dp"
+            android:layout_below="@id/activity_calling_door_layout_title"
             android:layout_above="@id/app_version"
             android:layout_alignParentRight="true">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
                 android:layout_marginRight="10dp"
                 android:orientation="vertical">
 
@@ -87,7 +45,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
-                    android:layout_marginBottom="30dp"
+                    android:layout_marginBottom="40dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:drawableLeft="@mipmap/ic_call"
                     android:drawablePadding="6dp"
@@ -97,13 +55,13 @@
                     android:ellipsize="end"
                     android:text="@string/str_call_bed"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="22sp" />
 
                 <TextView
                     android:id="@+id/room_action_call"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="30dp"
+                    android:layout_marginBottom="40dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:drawableLeft="@mipmap/ic_call"
                     android:drawablePadding="6dp"
@@ -113,13 +71,13 @@
                     android:ellipsize="end"
                     android:text="@string/str_call_nurse"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="22sp" />
 
                 <TextView
                     android:id="@+id/room_cancel_call"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="30dp"
+                    android:layout_marginBottom="40dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:drawableLeft="@mipmap/ic_call"
                     android:drawablePadding="6dp"
@@ -129,13 +87,13 @@
                     android:ellipsize="end"
                     android:text="@string/str_cancel_call"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="22sp" />
 
                 <TextView
                     android:id="@+id/room_action_support"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="30dp"
+                    android:layout_marginBottom="40dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:drawableLeft="@mipmap/ic_support"
                     android:drawablePadding="6dp"
@@ -145,13 +103,13 @@
                     android:ellipsize="end"
                     android:text="@string/str_support"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="22sp" />
 
                 <TextView
                     android:id="@+id/room_action_nurse"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="30dp"
+                    android:layout_marginBottom="40dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:drawableLeft="@drawable/ic_nursing"
                     android:drawablePadding="6dp"
@@ -161,7 +119,7 @@
                     android:ellipsize="end"
                     android:text="@string/enter_nursing"
                     android:textColor="@color/white"
-                    android:textSize="20sp" />
+                    android:textSize="22sp" />
 
                 <TextView
                     android:id="@+id/room_action_language_set"
@@ -175,17 +133,68 @@
                     android:ellipsize="end"
                     android:text="@string/language_set_title"
                     android:textColor="@color/white"
-                    android:textSize="20sp" />
+                    android:textSize="22sp" />
 
             </LinearLayout>
         </ScrollView>
 
+        <LinearLayout
+            android:id="@+id/ll_room_name"
+            android:layout_width="match_parent"
+            android:layout_height="154dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_toLeftOf="@id/room_actions"
+            android:layout_below="@id/activity_calling_door_layout_title">
+            <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+                android:id="@+id/tv_room_name"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginTop="-10dp"
+                android:layout_weight="2.2"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:gravity="center_vertical"
+                android:text="--"
+                android:textColor="@color/main_color"
+                android:textSize="112sp"
+                android:textStyle="bold"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true" />
+
+            <ViewFlipper
+                android:id="@+id/view_flipper"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:autoStart="true"
+                android:flipInterval="5000"
+                android:inAnimation="@anim/slide_down_in"
+                android:outAnimation="@anim/slide_up_out">
+                <!--<TextView
+                    android:id="@+id/call_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center|right"
+                    android:text="09床 呼叫"
+                    android:textColor="@color/color_red"
+                    android:textSize="32sp" />-->
+            </ViewFlipper>
+        </LinearLayout>
+
+
+
         <!--床位fragment区域-->
         <FrameLayout
             android:id="@+id/callingdoor_main_frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_margin="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:padding="10dp"
             android:layout_below="@id/ll_room_name"
             android:layout_toLeftOf="@id/room_actions"/>
 

android_door/src/main/h10_3128/res/layout/item_bed.xml

@@ -1,303 +1,306 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="290dp"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_item_bed"
+    android:layout_width="264dp"
     android:layout_height="match_parent"
-    android:paddingLeft="4dp"
-    android:orientation="vertical">
+    android:layout_marginLeft="4dp"
+    android:layout_marginRight="4dp"
+    android:background="@drawable/shape_bed_item_bg"
+    android:orientation="vertical"
+    android:gravity="center">
 
     <LinearLayout
+        android:id="@+id/ll_nurse_configs"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/tv_bed_name_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            android:padding="4dp"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:text="--"
-            android:textColor="@color/main_color"
-            android:textSize="36sp"/>
-        <TextView
-            android:id="@+id/tv_bed_card_no"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:textColor="#B4B4B4"
-            android:textSize="16sp"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:baselineAligned="false">
-
-        <!--护理项-->
-        <LinearLayout
-            android:id="@+id/ll_nurse_configs"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1.2"
-            android:baselineAligned="false"
-            android:orientation="vertical">
+        android:layout_height="wrap_content"
+        android:baselineAligned="false"
+        android:orientation="vertical"
+        android:visibility="gone">
 
-            <RelativeLayout
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/nurse_config_item_height"
+            android:layout_marginTop="10dp">
+            <View
+                android:id="@+id/nurse_config_item_color1"
+                android:layout_width="20dp"
+                android:layout_height="match_parent"
+                android:background="@color/nursing_default_color"/>
+            <TextView
+                android:id="@+id/nurse_config_item_name1"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/nurse_config_item_height"
-                android:layout_marginTop="10dp">
-                <View
-                    android:id="@+id/nurse_config_item_color1"
-                    android:layout_width="10dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/nursing_default_color"/>
-                <TextView
-                    android:id="@+id/nurse_config_item_name1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/nurse_config_item_color1"
-                    android:paddingLeft="4dp"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/default_nurse_config_name"
-                    android:textColor="@color/text_name_color"
-                    android:textSize="18sp"/>
-                <TextView
-                    android:id="@+id/nurse_config_item_value1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/nurse_config_item_color1"
-                    android:layout_alignParentBottom="true"
-                    android:paddingRight="4dp"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/str_empty"
-                    android:textColor="@color/main_color"
-                    android:textSize="20sp"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/nurse_config_item_color1"
+                android:paddingLeft="4dp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/default_nurse_config_name"
+                android:textColor="@color/text_name_color"
+                android:textSize="22sp"/>
+            <TextView
+                android:id="@+id/nurse_config_item_value1"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/nurse_config_item_height"
-                android:layout_marginTop="@dimen/nurse_config_margin">
-                <View
-                    android:id="@+id/nurse_config_item_color2"
-                    android:layout_width="10dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/nursing_default_color"/>
-                <TextView
-                    android:id="@+id/nurse_config_item_name2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/nurse_config_item_color2"
-                    android:paddingLeft="4dp"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/default_nurse_config_name"
-                    android:textColor="@color/text_name_color"
-                    android:textSize="18sp"/>
-                <TextView
-                    android:id="@+id/nurse_config_item_value2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/nurse_config_item_color2"
-                    android:layout_alignParentBottom="true"
-                    android:paddingRight="4dp"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/str_empty"
-                    android:textColor="@color/main_color"
-                    android:textSize="20sp"/>
-            </RelativeLayout>
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/nurse_config_item_color1"
+                android:layout_alignParentBottom="true"
+                android:paddingRight="4dp"
+                android:gravity="right"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/str_empty"
+                android:textColor="@color/main_color"
+                android:textSize="26sp"/>
+        </RelativeLayout>
 
-            <RelativeLayout
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/nurse_config_item_height"
+            android:layout_marginTop="16dp">
+            <View
+                android:id="@+id/nurse_config_item_color2"
+                android:layout_width="20dp"
+                android:layout_height="match_parent"
+                android:background="@color/nursing_default_color"/>
+            <TextView
+                android:id="@+id/nurse_config_item_name2"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/nurse_config_item_height"
-                android:layout_marginTop="@dimen/nurse_config_margin">
-                <View
-                    android:id="@+id/nurse_config_item_color3"
-                    android:layout_width="10dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/nursing_default_color"/>
-                <TextView
-                    android:id="@+id/nurse_config_item_name3"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/nurse_config_item_color3"
-                    android:paddingLeft="4dp"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/default_nurse_config_name"
-                    android:textColor="@color/text_name_color"
-                    android:textSize="18sp"/>
-                <TextView
-                    android:id="@+id/nurse_config_item_value3"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/nurse_config_item_color3"
-                    android:layout_alignParentBottom="true"
-                    android:paddingRight="4dp"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/str_empty"
-                    android:textColor="@color/main_color"
-                    android:textSize="20sp"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/nurse_config_item_color2"
+                android:paddingLeft="4dp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/default_nurse_config_name"
+                android:textColor="@color/text_name_color"
+                android:textSize="22sp"/>
+            <TextView
+                android:id="@+id/nurse_config_item_value2"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/nurse_config_item_height"
-                android:layout_marginTop="@dimen/nurse_config_margin">
-                <View
-                    android:id="@+id/nurse_config_item_color4"
-                    android:layout_width="10dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/nursing_default_color"/>
-                <TextView
-                    android:id="@+id/nurse_config_item_name4"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/nurse_config_item_color4"
-                    android:paddingLeft="4dp"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/default_nurse_config_name"
-                    android:textColor="@color/text_name_color"
-                    android:textSize="18sp"/>
-                <TextView
-                    android:id="@+id/nurse_config_item_value4"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/nurse_config_item_color4"
-                    android:layout_alignParentBottom="true"
-                    android:paddingRight="4dp"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/str_empty"
-                    android:textColor="@color/main_color"
-                    android:textSize="20sp"/>
-            </RelativeLayout>
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/nurse_config_item_color2"
+                android:layout_alignParentBottom="true"
+                android:paddingRight="4dp"
+                android:gravity="right"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/str_empty"
+                android:textColor="@color/main_color"
+                android:textSize="26sp"/>
+        </RelativeLayout>
 
-            <RelativeLayout
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/nurse_config_item_height"
+            android:layout_marginTop="16dp">
+            <View
+                android:id="@+id/nurse_config_item_color3"
+                android:layout_width="20dp"
+                android:layout_height="match_parent"
+                android:background="@color/nursing_default_color"/>
+            <TextView
+                android:id="@+id/nurse_config_item_name3"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/nurse_config_item_height"
-                android:layout_marginTop="@dimen/nurse_config_margin">
-                <View
-                    android:id="@+id/nurse_config_item_color5"
-                    android:layout_width="10dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/nursing_default_color"/>
-                <TextView
-                    android:id="@+id/nurse_config_item_name5"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/nurse_config_item_color5"
-                    android:paddingLeft="4dp"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/default_nurse_config_name"
-                    android:textColor="@color/text_name_color"
-                    android:textSize="18sp"/>
-                <TextView
-                    android:id="@+id/nurse_config_item_value5"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/nurse_config_item_color5"
-                    android:layout_alignParentBottom="true"
-                    android:paddingRight="4dp"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/str_empty"
-                    android:textColor="@color/main_color"
-                    android:textSize="20sp"/>
-            </RelativeLayout>
-
-        </LinearLayout>
-
-        <!--入住信息-->
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.8"
-            android:layout_marginTop="10dp"
-            android:baselineAligned="false"
-            android:orientation="vertical"
-            android:gravity="center_horizontal">
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/nurse_config_item_color3"
+                android:paddingLeft="4dp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/default_nurse_config_name"
+                android:textColor="@color/text_name_color"
+                android:textSize="22sp"/>
+            <TextView
+                android:id="@+id/nurse_config_item_value3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/nurse_config_item_color3"
+                android:layout_alignParentBottom="true"
+                android:paddingRight="4dp"
+                android:gravity="right"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/str_empty"
+                android:textColor="@color/main_color"
+                android:textSize="26sp"/>
+        </RelativeLayout>
 
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/nurse_config_item_height"
+            android:layout_marginTop="16dp">
+            <View
+                android:id="@+id/nurse_config_item_color4"
+                android:layout_width="20dp"
+                android:layout_height="match_parent"
+                android:background="@color/nursing_default_color"/>
             <TextView
-                android:id="@+id/bed_customer_name"
-                android:layout_width="wrap_content"
+                android:id="@+id/nurse_config_item_name4"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableTop="@mipmap/ic_custom_male"
-                android:gravity="center"
-                android:text="--"
-                android:textColor="@color/black"
-                android:textSize="24sp"/>
+                android:layout_toRightOf="@id/nurse_config_item_color4"
+                android:paddingLeft="4dp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/default_nurse_config_name"
+                android:textColor="@color/text_name_color"
+                android:textSize="22sp"/>
+            <TextView
+                android:id="@+id/nurse_config_item_value4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/nurse_config_item_color4"
+                android:layout_alignParentBottom="true"
+                android:paddingRight="4dp"
+                android:gravity="right"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/str_empty"
+                android:textColor="@color/main_color"
+                android:textSize="26sp"/>
+        </RelativeLayout>
 
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/nurse_config_item_height"
+            android:layout_marginTop="16dp">
+            <View
+                android:id="@+id/nurse_config_item_color5"
+                android:layout_width="20dp"
+                android:layout_height="match_parent"
+                android:background="@color/nursing_default_color"/>
             <TextView
-                android:id="@+id/bed_customer_age"
-                android:layout_width="wrap_content"
+                android:id="@+id/nurse_config_item_name5"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:drawableLeft="@mipmap/ic_gender_male"
-                android:drawablePadding="4dp"
-                android:text="--"
-                android:textSize="20sp"/>
+                android:layout_toRightOf="@id/nurse_config_item_color5"
+                android:paddingLeft="4dp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/default_nurse_config_name"
+                android:textColor="@color/text_name_color"
+                android:textSize="22sp"/>
+            <TextView
+                android:id="@+id/nurse_config_item_value5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/nurse_config_item_color5"
+                android:layout_alignParentBottom="true"
+                android:paddingRight="4dp"
+                android:gravity="right"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/str_empty"
+                android:textColor="@color/main_color"
+                android:textSize="26sp"/>
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+        android:id="@+id/tv_bed_name_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:text="--"
+        android:textColor="@color/main_color"
+        android:textSize="60sp"
+        android:textStyle="bold"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:focusableInTouchMode="true"/>
+
+    <TextView
+        android:id="@+id/bed_customer_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:drawableLeft="@mipmap/ic_custom_male"
+        android:drawablePadding="10dp"
+        android:gravity="center"
+        android:text="--"
+        android:textColor="@color/black"
+        android:textSize="36sp" />
+
+    <TextView
+        android:id="@+id/bed_customer_age"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="--"
+        android:textSize="24sp" />
+
+    <TextView
+        android:id="@+id/tv_bed_card_no"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:textSize="24sp"
+        android:text="--"/>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="12dp">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
             <ImageView
                 android:id="@+id/bed_doctor_icon"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:layout_marginTop="20dp"
-                android:src="@mipmap/ic_doctor_default"/>
+                android:src="@mipmap/ic_doctor_default"
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/bed_doctor_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:text="@string/doctor_title"
+                android:text="责任医生"
                 android:textColor="@color/text_name_color"
-                android:textSize="14sp"/>
+                android:textSize="24sp" />
 
             <TextView
                 android:id="@+id/bed_doctor_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/str_empty"
+                android:text="暂无"
                 android:textColor="@color/black"
-                android:textSize="14sp"/>
+                android:textSize="28sp" />
+        </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
             <ImageView
                 android:id="@+id/bed_nurse_icon"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:layout_marginTop="10dp"
-                android:src="@mipmap/ic_nurse_default"/>
+                android:src="@mipmap/ic_nurse_default"
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/bed_nurse_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:text="@string/nurse_title"
+                android:text="责任护士"
                 android:textColor="@color/text_name_color"
-                android:textSize="14sp"/>
+                android:textSize="24sp" />
 
             <TextView
                 android:id="@+id/bed_nurse_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/str_empty"
+                android:text="暂无"
                 android:textColor="@color/black"
-                android:textSize="14sp"/>
-
+                android:textSize="28sp" />
         </LinearLayout>
 
     </LinearLayout>

android_door/src/main/h10_3128/res/layout/qr_code_lay.xml

@@ -13,80 +13,93 @@
         android:layout_marginBottom="6dp"
         android:background="@color/white"
         android:orientation="vertical">
+
         <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"
+            android:layout_gravity="center_horizontal" />
 
-        <TextView
-            android:id="@+id/tv_device_id"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="40dp"
-            android:text="ID:"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <TextView
-            android:id="@+id/tv_local_ip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginLeft="40dp"
-            android:text="IP:"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/tv_server_ip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginLeft="40dp"
-            android:text="Server:"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
+                <TextView
+                    android:id="@+id/tv_device_id"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:text="ID:"
+                    android:textColor="@color/black"
+                    android:textSize="20sp" />
 
-        <TextView
-            android:id="@+id/tv_local_mac"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginLeft="40dp"
-            android:text="MAC:"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
+                <TextView
+                    android:id="@+id/tv_local_ip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginTop="4dp"
+                    android:text="IP:"
+                    android:textColor="@color/black"
+                    android:textSize="20sp" />
 
-        <TextView
-            android:id="@+id/tv_device_sn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginLeft="40dp"
-            android:text="Identifier:"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
+                <TextView
+                    android:id="@+id/tv_server_ip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginTop="4dp"
+                    android:text="Server:"
+                    android:textColor="@color/black"
+                    android:textSize="20sp" />
 
-        <TextView
-            android:id="@+id/tv_app_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginLeft="40dp"
-            android:text="Version:"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
+                <TextView
+                    android:id="@+id/tv_local_mac"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginTop="4dp"
+                    android:text="MAC:"
+                    android:textColor="@color/black"
+                    android:textSize="20sp" />
 
-        <TextView
-            android:id="@+id/tv_mcu_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginLeft="40dp"
-            android:text="MCU:"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
+                <TextView
+                    android:id="@+id/tv_device_sn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginTop="4dp"
+                    android:text="Identifier:"
+                    android:textColor="@color/black"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:id="@+id/tv_app_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginTop="4dp"
+                    android:text="Version:"
+                    android:textColor="@color/black"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:id="@+id/tv_mcu_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginTop="4dp"
+                    android:text="MCU:"
+                    android:textColor="@color/black"
+                    android:textSize="20sp" />
+            </LinearLayout>
+
+        </ScrollView>
     </LinearLayout>
 
     <RelativeLayout

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)

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java

@@ -219,4 +219,6 @@ public class Constant {
     public static final int EVENT_EXIT_TEST = 0x12;
     public static final int EVENT_UPDATE_BEDS = 0x13;
     public static final int EVENT_REMOVE_CALL_BED = 0x14;
+
+    public static final int EVENT_CLEAR_CALLS = 0x15;
 }

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

@@ -64,6 +64,8 @@
     <string name="default_nurse_config_name">Elemento de enfermera</string>
     <string name="str_empty">NULO</string>
     <string name="str_null">NULO</string>
+    <string name="str_male">hombre</string>
+    <string name="str_female">mujer</string>
     <string name="device_disable">Dispositivo deshabilitado</string>
     <string name="str_disable">Activar dispositivo</string>
     <string name="str_enable">Habilitado</string>

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

@@ -63,6 +63,8 @@
     <string name="default_nurse_config_name">Элемент медсестры</string>
     <string name="str_empty">НОЛЬ</string>
     <string name="str_null">НОЛЬ</string>
+    <string name="str_male">мужчина</string>
+    <string name="str_female">женщина</string>
     <string name="device_disable">Устройство отключено</string>
     <string name="str_disable">Включить устройство</string>
     <string name="str_enable">Включено</string>

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

@@ -64,6 +64,8 @@
     <string name="default_nurse_config_name">护理</string>
     <string name="str_empty">暂无</string>
     <string name="str_null">未知</string>
+    <string name="str_male">男</string>
+    <string name="str_female">女</string>
     <string name="device_disable">设备未启用</string>
     <string name="str_disable">未启用</string>
     <string name="str_enable">已启用</string>

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

@@ -80,4 +80,6 @@
     <color name="javashop_color_post_comment_right_tc">#FA511F</color>
     <color name="javashop_color_coupon_a">#4d91ce</color>
     <color name="javashop_color_coupon_b">#ffffff</color>
+
+    <color name="bed_light_color">#44f29200</color>
 </resources>

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

@@ -63,6 +63,8 @@
     <string name="default_nurse_config_name">NULL</string>
     <string name="str_empty">NULL</string>
     <string name="str_null">NULL</string>
+    <string name="str_male">Male</string>
+    <string name="str_female">Female</string>
     <string name="device_disable">Device disabled</string>
     <string name="str_disable">Device enable</string>
     <string name="str_enable">Enabled</string>