1.启动界面去掉logo显示，改用loading字符

2.分机正在通话时收到门口机取消呼叫事件则不做处理

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

@@ -1093,7 +1093,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
                 if (Constant.DEVICE_ID != -1) {
                     OtherUtil.sendReinforce(Constant.DEVICE_ID)
                 } else {
-                    showMessage("no device id!")
+                    showMessage("null device id!")
                 }
             } else {
                 showMessage(R.string.net_error)

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/SkyCallFragment.kt

@@ -400,6 +400,11 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
                     val curTcpModel = messageEvent.message as TcpModel
                     if (curTcpModel.getType() == TcpType.VOICE) {
                         if (curTcpModel.action == TcpAction.VoiceAction.CANCEL_BY_DOOR) {
+                            //如果当前正在通话中则不做取消处理
+                            if (Constant.CALL_STATE == Constant.CALL_CALLING) {
+                                return
+                            }
+
                             Constant.CALL_STATE = Constant.CALL_STANDBY
                             VoiceUtil.cancelAudioCall(Constant.DEVICE_ID)
                             cancelCall()

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

@@ -63,6 +63,7 @@
     <string name="tips_reboot">Reinicie el dispositivo</string>
     <string name="broadcast_start">Start broadcast</string>
     <string name="broadcast_stop">Stop broadcast</string>
+
     <string name="no_response">Sin respuesta</string>
     <string name="call_success">Llamada exitosa</string>
     <string name="call_in_calling">Llamando…</string>
@@ -74,6 +75,7 @@
     <string name="call_busy">Ocupado</string>
     <string name="call_incoming">Nueva llamada…</string>
     <string name="call_failed">Error de llamada</string>
+
     <string name="indate">Fecha de entrada: </string>
     <string name="subtotal">Subtotal: </string>
     <string name="countdown_time">%ds</string>

welcome/src/main/res/layout/activity_welcome.xml

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout>
     <android.support.constraint.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/activity_main_inference"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <ImageView
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:src="@mipmap/welcome"
-            android:scaleType="centerInside" />
+            android:gravity="center"
+            android:text="Loading..."
+            android:textSize="32sp"
+            android:textColor="@color/black"/>
     </android.support.constraint.ConstraintLayout>
 </layout>