去掉门口机呼叫功能，修改进入护理按钮为长按生效，防止误触

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

@@ -118,11 +118,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() {
@@ -439,14 +435,14 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
 
     override fun bindEvent() {
         //护理按钮
-        room_action_nurse.setOnClickListener {
+        room_action_nurse.setOnLongClickListener {
             if (!Constant.TCP_CONNECTED) {
-                return@setOnClickListener
+                return@setOnLongClickListener true
             }
 
             if (Constant.DEVICE_ID == -1) {
                 showMessage("没有设备id!")
-                return@setOnClickListener
+                return@setOnLongClickListener true
             }
 
             if (Constant.inNursing) {
@@ -478,6 +474,8 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                     OtherUtil.sendNursing(Constant.DEVICE_ID)
                 }
             }
+
+            return@setOnLongClickListener true
         }
 
         //增援按钮
@@ -845,13 +843,13 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             }
 
             //按钮名称显示
-            if (!TextUtils.isEmpty(partSetting.doorNurseTitle)) {
+            /*if (!TextUtils.isEmpty(partSetting.doorNurseTitle)) {
                 room_action_call.visibility = View.VISIBLE
                 room_action_call.text = partSetting.doorNurseTitle
             }
             if (partSetting.doorNurseValid != null && partSetting.doorNurseValid == 0) {
                 room_action_call.visibility = View.GONE
-            }
+            }*/
 
             if (!TextUtils.isEmpty(partSetting.doorNursingTitle)) {
                 room_action_nurse.visibility = View.VISIBLE

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

@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_above="@id/room_action_nurse"
-                android:layout_marginBottom="24dp"
+                android:layout_marginBottom="40dp"
                 android:background="@mipmap/bg_bottom_btn"
                 android:drawableLeft="@mipmap/ic_support"
                 android:drawablePadding="6dp"
@@ -78,7 +78,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_above="@id/room_action_support"
-                android:layout_marginBottom="24dp"
+                android:layout_marginBottom="40dp"
                 android:background="@mipmap/bg_bottom_btn"
                 android:drawableLeft="@mipmap/ic_call"
                 android:drawablePadding="6dp"
@@ -100,7 +100,8 @@
                 android:gravity="center_vertical"
                 android:text="呼叫护士"
                 android:textSize="18sp"
-                android:textColor="@drawable/selector_bottom_btn_text_color"/>
+                android:textColor="@drawable/selector_bottom_btn_text_color"
+                android:visibility="gone" />
             <TextView
                 android:id="@+id/room_action_call_bed"
                 android:layout_width="match_parent"
@@ -114,7 +115,8 @@
                 android:gravity="center_vertical"
                 android:text="呼叫床位"
                 android:textSize="18sp"
-                android:textColor="@drawable/selector_bottom_btn_text_color" />
+                android:textColor="@drawable/selector_bottom_btn_text_color"
+                android:visibility="gone" />
         </RelativeLayout>
 
         <!--床位fragment区域-->