门口机增加取消分机呼叫功能，优化按钮点击效果

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

@@ -570,24 +570,25 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         }
 
         //门口机取消分机呼叫（此处要修改）
-//        room_cancel_call.setOnClickListener {
-//            if (Constant.TCP_CONNECTED) {
-//                if (Constant.DEVICE_ID != -1) {
-//                    VoiceUtil.cancelCallByDoor(Constant.DEVICE_ID)
-//                } else {
-//                    showMessage("null device id!")
-//                }
-//            } else {
-//                showMessage(R.string.net_error)
-//            }
-//
-//            Constant.callNums == 0
-//            DoorLightHelper.resetDoorLight()
-//
-//            SpeechUtil.getInstance().stopSpeak()
-//            bedCalls.clear()
-//            view_flipper.removeAllViews()
-//        }
+        menu_cancel_call.setOnClickListener {
+            if (Constant.TCP_CONNECTED) {
+                if (Constant.DEVICE_ID != -1) {
+                    VoiceUtil.cancelCallByDoor(Constant.DEVICE_ID)
+                } else {
+                    showMessage("null device id!")
+                }
+            } else {
+                showMessage(R.string.net_error)
+            }
+
+            Constant.callNums = 0
+            DoorLightHelper.resetDoorLight()
+
+            SpeechUtil.getInstance().stopSpeak()
+            bedCalls.clear()
+            showCalls()
+        }
+
         //长按 版本号出现 （此处需要调整）
 //        app_version.setOnLongClickListener {
 //            AppInfoDialogHelper.showAppDialog(activity,
@@ -1449,7 +1450,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                     }
                 }*/
             }
-//分机呼叫显示
+            //分机呼叫显示
             showCalls()
         } catch (ex: Exception) {
             ex.printStackTrace()
@@ -1476,7 +1477,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                     showCalls()
                 }
             } else {
-                Constant.callNums == 0
+                Constant.callNums = 0
                 DoorLightHelper.resetDoorLight()
             }
         } catch (ex: Exception) {

callingdoor/src/main/res/drawable/ic_cancel_call.xml

@@ -0,0 +1,5 @@
+<vector android:height="28dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
+</vector>

callingdoor/src/main/res/drawable/selector_callhu_bt.xml

@@ -4,6 +4,7 @@
             <item android:drawable="@mipmap/hu_bg" />
             <item>
                 <shape>
+                    <corners android:radius="10dp"/>
                     <solid android:color="#51000000" />
                 </shape>
             </item>

callingdoor/src/main/res/drawable/selector_zengyuan_bt.xml

@@ -4,6 +4,7 @@
             <item android:drawable="@mipmap/zeng_bg" />
             <item>
                 <shape>
+                    <corners android:radius="10dp"/>
                     <solid android:color="#51000000" />
                 </shape>
             </item>

callingdoor/src/main/res/layout-land/callingdoor_main_new.xml

@@ -41,7 +41,7 @@
                     android:ellipsize="end"
                     android:text="@string/str_home"
                     android:focusableInTouchMode="true"
-                    android:textSize="14sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/menu_medical_care"
@@ -61,7 +61,7 @@
                     android:ellipsize="end"
                     android:visibility="gone"
                     android:text="@string/str_medical_care"
-                    android:textSize="14sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/menu_more"
@@ -80,29 +80,48 @@
                     android:singleLine="true"
                     android:ellipsize="end"
                     android:text="@string/str_more"
-                    android:textSize="14sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/menu_support"
                     android:layout_width="96dp"
-                    android:layout_height="96dp"
-                    android:layout_marginTop="80dp"
+                    android:layout_height="88dp"
+                    android:layout_marginTop="12dp"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
-                    android:layout_above="@+id/menu_call_nurse"
+                    android:layout_above="@+id/menu_cancel_call"
                     android:background="@drawable/selector_zengyuan_bt"
                     android:clickable="true"
                     android:drawableTop="@mipmap/zengyuan"
                     android:gravity="center"
-                    android:padding="20dp"
+                    android:paddingTop="20dp"
+                    android:paddingBottom="20dp"
                     android:text="@string/str_supports"
                     android:textColor="@color/white"
-                    android:textSize="14sp" />
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/menu_cancel_call"
+                    android:layout_width="96dp"
+                    android:layout_height="88dp"
+                    android:layout_above="@+id/menu_call_nurse"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginTop="12dp"
+                    android:background="@drawable/selector_callhu_bt"
+                    android:clickable="true"
+                    android:drawableTop="@drawable/ic_cancel_call"
+                    android:gravity="center"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:text="@string/str_cancel_call"
+                    android:textColor="@color/white"
+                    android:textSize="16sp" />
 
                 <TextView
                     android:id="@+id/menu_call_nurse"
                     android:layout_width="96dp"
-                    android:layout_height="96dp"
+                    android:layout_height="88dp"
                     android:layout_above="@+id/menu_call_bed"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
@@ -111,15 +130,16 @@
                     android:clickable="true"
                     android:drawableTop="@mipmap/hujiao"
                     android:gravity="center"
-                    android:padding="20dp"
+                    android:paddingTop="20dp"
+                    android:paddingBottom="20dp"
                     android:text="@string/str_call_nurse"
                     android:textColor="@color/white"
-                    android:textSize="13sp" />
+                    android:textSize="16sp" />
 
                 <TextView
                     android:id="@+id/menu_call_bed"
                     android:layout_width="96dp"
-                    android:layout_height="96dp"
+                    android:layout_height="88dp"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
                     android:layout_marginTop="12dp"
@@ -128,11 +148,12 @@
                     android:clickable="true"
                     android:drawableTop="@mipmap/chuang"
                     android:gravity="center"
-                    android:padding="20dp"
+                    android:paddingTop="20dp"
+                    android:paddingBottom="20dp"
                     android:text="@string/str_call_bed"
                     android:layout_alignParentBottom="true"
                     android:textColor="@color/white"
-                    android:textSize="13sp" />
+                    android:textSize="16sp" />
             </RelativeLayout>
 <!--        </ScrollView>-->
         <RelativeLayout

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

@@ -86,10 +86,9 @@
                     android:id="@+id/menu_support"
                     android:layout_width="80dp"
                     android:layout_height="80dp"
-                    android:layout_marginTop="80dp"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
-                    android:layout_above="@+id/menu_call_nurse"
+                    android:layout_above="@+id/menu_cancel_call"
                     android:background="@drawable/selector_zengyuan_bt"
                     android:clickable="true"
                     android:drawableTop="@mipmap/zengyuan"
@@ -100,6 +99,23 @@
                     android:textSize="12sp" />
 
                 <TextView
+                    android:id="@+id/menu_cancel_call"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_above="@+id/menu_call_nurse"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginTop="12dp"
+                    android:background="@drawable/selector_callhu_bt"
+                    android:clickable="true"
+                    android:drawableTop="@drawable/ic_cancel_call"
+                    android:gravity="center"
+                    android:padding="20dp"
+                    android:text="@string/str_cancel_call"
+                    android:textColor="@color/white"
+                    android:textSize="10sp" />
+
+                <TextView
                     android:id="@+id/menu_call_nurse"
                     android:layout_width="80dp"
                     android:layout_height="80dp"