门口机修改成默认3个床位显示，多余3个自动滚动

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

@@ -137,11 +137,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
     private var netErrCount : Int = 0
 
     override fun getLayId(): Int {
-        if ("rk3288".equals(Build.MODEL)) {
-            return R.layout.callingdoor_main_lay_rk3288
-        } else {
-            return R.layout.callingdoor_main_lay
-        }
+        return R.layout.callingdoor_main_lay
     }
 
     override fun bindDagger() {
@@ -967,9 +963,9 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 Constant.POWER_RESET = partSetting.powerControl
             }
 
-            if (Constant.POWER_RESET) {
+            /*if (Constant.POWER_RESET) {
                 room_action_power_reset.visibility = View.VISIBLE
-            }
+            }*/
 
         } catch (ex: Exception) {
             showMessage(StringUtil.getResString(R.string.setting_params_error) + ex.message)

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

@@ -67,7 +67,7 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
     }
 
     override fun getItemCount(): Int {
-        if (data.size <= 2) {
+        if (data.size <= 3) {
             return data.size
         } else {
             return Int.MAX_VALUE
@@ -102,7 +102,7 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
         if (TextUtils.isEmpty(bedVO.customerName)) {
             //空床位
             holder.customName.setText(R.string.str_empty)
-            holder.customAge.visibility = View.INVISIBLE
+            holder.customAge.text = "--"
             holder.doctorName.setText(R.string.str_empty)
             holder.nurseName.setText(R.string.str_empty)
 

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

@@ -73,7 +73,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
             roomAdpter.setData(bedList)
             Utils.setInBedVos(bedList)
             rv_bed_view.itemAnimator = DefaultItemAnimator()
-            if (bedList.size > 2) {
+            if (bedList.size > 3) {
                 //自动滚动显示
                 rv_bed_view.start()
             } else {

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

@@ -1,8 +1,6 @@
 package com.wdkl.app.ncs.callingdoor.fragment
 
-import android.graphics.BitmapFactory
 import android.os.Build
-import android.view.View
 import com.enation.javashop.net.engine.model.NetState
 import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.R
@@ -73,9 +71,9 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
         tv_app_version.text = "Version: V" + BuildConfig.VERSION_NAME + "_" + BuildConfig.VERSION_CODE + "_" + Build.MODEL
         tv_mcu_version.text = "MCU: " + Constant.MCU_VERSION_NUMBER
 
-        if (Constant.POWER_RESET) {
+        /*if (Constant.POWER_RESET) {
             tv_btn_power_reset.visibility = View.VISIBLE
-        }
+        }*/
     }
 
     override fun bindEvent() {

callingdoor/src/main/res/layout/callingdoor_main_lay.xml

@@ -72,28 +72,25 @@
             android:textColor="@color/main_color"
             android:textSize="20sp" />
 
-        <!--右侧按钮区域-->
-        <ScrollView
+        <!--按钮区域-->
+        <HorizontalScrollView
             android:id="@+id/room_actions"
-            android:layout_width="154dp"
-            android:layout_height="match_parent"
-            android:layout_below="@id/ll_room_name"
-            android:layout_above="@id/app_version"
-            android:layout_alignParentRight="true">
+            android:layout_width="match_parent"
+            android:layout_height="72dp"
+            android:layout_toLeftOf="@+id/app_version"
+            android:layout_alignParentBottom="true">
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginRight="10dp"
-                android:orientation="vertical">
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/room_action_call_bed"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="30dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:drawableLeft="@mipmap/ic_call"
                     android:drawablePadding="6dp"
@@ -107,9 +104,9 @@
 
                 <TextView
                     android:id="@+id/room_action_call"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="30dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
+                    android:layout_marginLeft="30dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:drawableLeft="@mipmap/ic_call"
                     android:drawablePadding="6dp"
@@ -123,9 +120,9 @@
 
                 <TextView
                     android:id="@+id/room_cancel_call"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="30dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
+                    android:layout_marginLeft="30dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:drawableLeft="@mipmap/ic_call"
                     android:drawablePadding="6dp"
@@ -139,9 +136,9 @@
 
                 <TextView
                     android:id="@+id/room_action_support"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="30dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
+                    android:layout_marginLeft="30dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:drawableLeft="@mipmap/ic_support"
                     android:drawablePadding="6dp"
@@ -155,9 +152,9 @@
 
                 <TextView
                     android:id="@+id/room_action_nurse"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="30dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
+                    android:layout_marginLeft="30dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:drawableLeft="@drawable/ic_nursing"
                     android:drawablePadding="6dp"
@@ -171,9 +168,9 @@
 
                 <TextView
                     android:id="@+id/room_action_language_set"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="30dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
+                    android:layout_marginLeft="30dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:gravity="center"
                     android:padding="10dp"
@@ -181,13 +178,14 @@
                     android:ellipsize="end"
                     android:text="@string/language_set_title"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
-                    android:textSize="20sp" />
+                    android:textSize="20sp"
+                    android:visibility="gone"/>
 
                 <TextView
                     android:id="@+id/room_action_power_reset"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
+                    android:layout_marginLeft="30dp"
                     android:background="@mipmap/bg_bottom_btn"
                     android:gravity="center"
                     android:padding="10dp"
@@ -199,7 +197,7 @@
                     android:visibility="gone"/>
 
             </LinearLayout>
-        </ScrollView>
+        </HorizontalScrollView>
 
         <!--床位fragment区域-->
         <FrameLayout
@@ -208,7 +206,7 @@
             android:layout_height="match_parent"
             android:layout_margin="10dp"
             android:layout_below="@id/ll_room_name"
-            android:layout_toLeftOf="@id/room_actions"/>
+            android:layout_above="@id/room_actions"/>
 
         <!--通话界面-->
         <FrameLayout

callingdoor/src/main/res/layout/item_bed.xml

@@ -1,50 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/ll_item_bed"
-    android:layout_width="416dp"
+    android:layout_width="330dp"
     android:layout_height="match_parent"
     android:layout_margin="4dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
     android:background="@color/right_item_select"
     android:orientation="vertical"
     android:gravity="center_horizontal">
 
-    <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:layout_marginTop="10dp"
-        android:text="--"
-        android:textColor="@color/main_color"
-        android:textSize="56sp"
-        android:textStyle="bold"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"/>
-
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/bed_customer_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp">
+        <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+            android:id="@+id/tv_bed_name_title"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
             android:gravity="center"
             android:text="--"
+            android:textColor="@color/main_color"
+            android:textSize="56sp"
             android:textStyle="bold"
-            android:textColor="@color/black"
-            android:textSize="32sp" />
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="marquee_forever"/>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/bed_customer_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="--"
+                android:textStyle="bold"
+                android:textColor="@color/black"
+                android:textSize="32sp" />
+
+            <TextView
+                android:id="@+id/bed_customer_age"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:gravity="center"
+                android:textColor="@color/black"
+                android:text="--"
+                android:textSize="24sp" />
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/bed_customer_age"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:gravity="center"
-            android:textColor="@color/black"
-            android:text="--"
-            android:textSize="24sp" />
     </LinearLayout>
 
     <TextView
@@ -59,12 +72,14 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="18dp">
+        android:layout_marginTop="10dp">
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="2dp"
             android:gravity="center"
             android:orientation="vertical">
             <ImageView
@@ -78,7 +93,7 @@
                 android:id="@+id/bed_doctor_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="10dp"
                 android:text="责任医生"
                 android:textStyle="bold"
                 android:textColor="@color/black"
@@ -88,7 +103,7 @@
                 android:id="@+id/bed_doctor_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="10dp"
                 android:text="暂无"
                 android:textStyle="bold"
                 android:textColor="@color/black"
@@ -99,6 +114,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="4dp"
             android:gravity="center"
             android:orientation="vertical">
             <ImageView
@@ -112,7 +129,7 @@
                 android:id="@+id/bed_nurse_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="10dp"
                 android:text="责任护士"
                 android:textStyle="bold"
                 android:textColor="@color/black"
@@ -122,7 +139,7 @@
                 android:id="@+id/bed_nurse_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="10dp"
                 android:text="暂无"
                 android:textStyle="bold"
                 android:textColor="@color/black"

callingdoor/src/main/res/layout/qr_code_lay.xml

@@ -5,95 +5,102 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/ll_qr_code_view"
+    <ScrollView
+        android:id="@+id/scroll_qr_view"
         android:layout_width="360dp"
         android:layout_height="match_parent"
         android:layout_marginTop="6dp"
         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"/>
-
-        <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_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" />
-
-        <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_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" />
+        android:background="@color/white">
 
-        <TextView
-            android:id="@+id/tv_device_sn"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/ll_qr_code_view"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginLeft="40dp"
-            android:text="Identifier:"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
+            android:orientation="vertical">
 
-        <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" />
+            <ImageView
+                android:id="@+id/view_qr_code"
+                android:layout_width="200dp"
+                android:layout_height="200dp"
+                android:layout_gravity="center_horizontal" />
 
-        <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" />
-    </LinearLayout>
+            <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_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_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_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_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>
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
-        android:layout_toRightOf="@id/ll_qr_code_view"
+        android:layout_toRightOf="@id/scroll_qr_view"
         android:layout_marginTop="6dp"
         android:layout_marginBottom="6dp"
         android:layout_marginLeft="10dp"