#CHANGE 修改门口机包名，APP名称等

app/build.gradle

@@ -32,7 +32,7 @@ android {
     aaptOptions.cruncherEnabled = false
     aaptOptions.useNewCruncher = false
     defaultConfig {
-        applicationId "com.wdkl.app.ncs.callingbed2"
+        applicationId "com.wdkl.app.ncs.callingdoor"
         minSdkVersion min_sdk_version
         targetSdkVersion target_sdk_version
         versionCode app_version_code
@@ -122,7 +122,7 @@ dependencies {
         //compile project(':setting')   // ===> 设置模块 设置 缓存 App分享等
         compile project(':extra')    // ===> 额外的一些页面 比如二维码扫描等一些附加功能
         //compile project(':hello')
-        compile project(':callingbed2')
+        compile project(':callingdoor')
         //compile project(':sip')
     }
     /**

app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -5,10 +5,9 @@ import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.enation.javashop.net.engine.config.NetEngineConfig
 import com.enation.javashop.net.engine.plugin.exception.RestfulExceptionInterceptor
 import com.enation.javashop.utils.base.config.BaseConfig
-import com.wdkl.app.ncs.callingbed2.helper.AnrFcExceptionUtil
-import com.wdkl.app.ncs.callingbed2.helper.NetHelper
-import com.wdkl.app.ncs.callingbed2.helper.SoundPoolManager
-import com.wdkl.app.ncs.callingbed2.helper.Utils
+import com.wdkl.app.ncs.callingdoor.helper.AnrFcExceptionUtil
+import com.wdkl.app.ncs.callingdoor.helper.NetHelper
+import com.wdkl.app.ncs.callingdoor.helper.Utils
 import com.wdkl.core.socket.SocketManager
 import com.wdkl.core.voip.VoipEvent
 import com.wdkl.net.HttpRequestPresenter
@@ -57,7 +56,7 @@ class Application : BaseApplication() {
 
         //JRouter.prepare().create("/hello/launch").seek()
 
-        JRouter.prepare().create("/callingbed2/launch").seek()
+        JRouter.prepare().create("/callingdoor/launch").seek()
     }
 
     /**

bedlib/src/main/java/serialporttest/utils/SerialPortUtil.java

@@ -426,6 +426,10 @@ public class SerialPortUtil {
     public static final String C_SEPARATE = ",";//分隔符
 
     /**
+     * 音频输出通道<br>
+     */
+    public static final String AUDIO = "AUDIO";
+    /**
      * 手柄MIC切换<br>
      */
     public static final String MIC = "MIC";

build.gradle

@@ -42,7 +42,7 @@ buildscript {
     /**
      * 支持库版本
      */
-    ext.support_library_version = "26.0.1"
+    ext.support_library_version = "26.1.0"
 
     /**
      * APP版本码
@@ -52,7 +52,7 @@ buildscript {
     /**
      * APP版本号
      */
-    ext.app_version = "1.4"
+    ext.app_version = "1.0"
 
     /**
      * 项目依赖库

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/SerialPortHelper.java

@@ -1,37 +0,0 @@
-package com.wdkl.app.ncs.callingbed2.helper;
-
-import serialporttest.utils.SerialPortUtil;
-
-public class SerialPortHelper {
-
-    //MIC设置
-    public static void setHandsMIC(boolean isHandsMIC) {
-        if (isHandsMIC) {
-            //打开手柄mic
-            SerialPortUtil.getInstance().sendCommand(SerialPortUtil.MIC, "0", "F");
-        } else {
-            //打开面板mic
-            SerialPortUtil.getInstance().sendCommand(SerialPortUtil.MIC, "1", "F");
-        }
-    }
-
-    /*
-     * 呼叫和通话状态
-     * data: 0 -- 正常，  1 -- 正在呼叫， 2 -- 通话中
-     */
-    public static void setCallStatus(String data) {
-        SerialPortUtil.getInstance().sendCommand(SerialPortUtil.CALL_STATUS , data, "F");
-    }
-
-    /**
-     * 设置卫生间紧急按钮灯状态: 0关闭1打开2闪烁
-     */
-    public static void setSosLight(String state) {
-        SerialPortUtil.getInstance().sendCommand(SerialPortUtil.ULED, state, "F");
-    }
-
-    //重置设备
-    public static void resetDevice() {
-        SerialPortUtil.getInstance().sendCommand(SerialPortUtil.NET_STATUS , "1", "F");
-    }
-}

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/launch/Callingbed2Launch.kt

@@ -1,20 +0,0 @@
-package com.wdkl.app.ncs.callingbed2.launch
-
-import com.enation.javashop.android.jrouter.external.annotation.Router
-import com.wdkl.app.ncs.callingbed2.di.Callingbed2Component
-import com.wdkl.app.ncs.callingbed2.di.DaggerCallingbed2Component
-import com.wdkl.ncs.android.lib.base.BaseLaunch
-import com.wdkl.ncs.android.middleware.di.DaggerManager
-
-@Router(path = "/callingbed2/launch")
-class Callingbed2Launch :BaseLaunch() {
-    companion object {
-        lateinit var component:Callingbed2Component
-    }
-
-    override fun moduleInit() {
-        component = DaggerCallingbed2Component.builder()
-                .applicationComponent(DaggerManager.APPLICATION_COMPONENT)
-                .build()
-    }
-}

callingbed2/build.gradle

@@ -22,7 +22,7 @@ android {
 
     defaultConfig {
         if (componentTag){
-            applicationId "com.wdkl.app.ncs.callingbed2"
+            applicationId "com.wdkl.app.ncs.callingdoor"
             multiDexEnabled true
         }
 

callingbed2/src/androidTest/java/com/wdkl/app/ncs/callingbed2/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2
+package com.wdkl.app.ncs.callingdoor
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.wdkl.app.ncs.callingbed2", appContext.packageName)
+        assertEquals("com.wdkl.app.ncs.callingdoor", appContext.packageName)
     }
 }

callingbed2/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.wdkl.app.ncs.callingbed2">
+    package="com.wdkl.app.ncs.callingdoor">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -13,10 +13,10 @@
         android:label="@string/app_name"
         android:supportsRtl="true" >
 
-        <activity android:name=".activity.Callingbed2Activity"
+        <activity android:name="com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity"
             android:screenOrientation="landscape"/>
 
-        <activity android:name=".activity.AppUpdateActivity"
+        <activity android:name="com.wdkl.app.ncs.callingdoor.activity.AppUpdateActivity"
             android:screenOrientation="landscape"
             android:launchMode="singleTask"/>
     </application>

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/activity/AppUpdateActivity.kt

@@ -1,21 +1,21 @@
-package com.wdkl.app.ncs.callingbed2.activity
+package com.wdkl.app.ncs.callingdoor.activity
 
 import android.text.TextUtils
 import android.util.Log
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
-import com.wdkl.app.ncs.callingbed2.R
-import com.wdkl.app.ncs.callingbed2.databinding.UpdateLayBinding
-import com.wdkl.app.ncs.callingbed2.helper.AppUpdateHelper
-import com.wdkl.app.ncs.callingbed2.helper.HttpHelper
-import com.wdkl.app.ncs.callingbed2.launch.Callingbed2Launch
+import com.wdkl.app.ncs.callingdoor.R
+import com.wdkl.app.ncs.callingdoor.databinding.UpdateLayBinding
+import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper
+import com.wdkl.app.ncs.callingdoor.helper.HttpHelper
+import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.api.UrlManager
 import com.wdkl.ncs.android.middleware.common.Constant
-import com.wdkl.ncs.android.middleware.logic.contract.callingbed2.AppUpdateContract
-import com.wdkl.ncs.android.middleware.logic.presenter.callingbed2.AppUpdatePresenter
+import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.AppUpdateContract
+import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.AppUpdatePresenter
 import kotlinx.android.synthetic.main.update_lay.*
 
 @Router(path = "/callingbed/update")
@@ -29,7 +29,7 @@ class AppUpdateActivity :BaseActivity<AppUpdatePresenter, UpdateLayBinding>(), A
     }
 
     override fun bindDagger() {
-        Callingbed2Launch.component.inject(this)
+        CallingdoorLaunch.component.inject(this)
     }
 
     override fun init() {

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/activity/Callingbed2Activity.kt

@@ -1,6 +1,5 @@
-package com.wdkl.app.ncs.callingbed2.activity
+package com.wdkl.app.ncs.callingdoor.activity
 
-import android.app.Dialog
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -13,29 +12,25 @@ import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
 import android.text.TextUtils
 import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.RelativeLayout
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
-import com.wdkl.app.ncs.callingbed2.BuildConfig
+import com.wdkl.app.ncs.callingdoor.BuildConfig
 //import com.wdkl.app.ncs.callingbed2.sip.SipHelper
 //import com.wdkl.app.ncs.callingbed2.sip.SipStatus
 //import com.vvsip.ansip.IVvsipServiceListener
 //import com.vvsip.ansip.VvsipCall
-import com.wdkl.app.ncs.callingbed2.R
-import com.wdkl.app.ncs.callingbed2.adapter.NurseConfigAdpter
-import com.wdkl.app.ncs.callingbed2.agreement.Callingbed2Agreement
+import com.wdkl.app.ncs.callingdoor.R
+import com.wdkl.app.ncs.callingdoor.adapter.NurseConfigAdpter
+import com.wdkl.app.ncs.callingdoor.agreement.CallingdoorAgreement
+import com.wdkl.app.ncs.callingdoor.databinding.CallingdoorMainLayBinding
 //import com.wdkl.app.ncs.callingbed2.common.Constant
 //import com.wdkl.app.ncs.callingbed2.common.MessageEvent
-import com.wdkl.app.ncs.callingbed2.databinding.Callingbed2MainLayBinding
-import com.wdkl.app.ncs.callingbed2.fragment.*
-import com.wdkl.app.ncs.callingbed2.helper.*
-import com.wdkl.app.ncs.callingbed2.launch.Callingbed2Launch
-import com.wdkl.app.ncs.callingbed2.settings.SettingConfig
+import com.wdkl.app.ncs.callingdoor.fragment.*
+import com.wdkl.app.ncs.callingdoor.helper.*
+import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
+import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 //import com.wdkl.app.ncs.sip.event.AEvent
 //import com.wdkl.app.ncs.sip.event.IEventListener
 //import com.wdkl.app.ncs.sip.helper.StarRtcHelper
@@ -45,15 +40,14 @@ import com.wdkl.core.socket.IUserState
 import com.wdkl.core.socket.SocketManager
 import com.wdkl.core.voip.CallSingleActivity
 import com.wdkl.ncs.android.lib.base.BaseActivity
-import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.lib.widget.MenuDialog
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
 import com.wdkl.ncs.android.middleware.common.SipStatus
-import com.wdkl.ncs.android.middleware.logic.contract.callingbed2.Callingbed2ActivityContract
-import com.wdkl.ncs.android.middleware.logic.presenter.callingbed2.Callingbed2ActivityPresenter
+import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.CallingdoorActivityContract
+import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.CallingdoorActivityPresenter
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
@@ -66,7 +60,7 @@ import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
-import kotlinx.android.synthetic.main.callingbed2_main_lay.*
+import kotlinx.android.synthetic.main.callingdoor_main_lay.*
 import kotlinx.android.synthetic.main.view_title_layout.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -75,14 +69,14 @@ import serialporttest.utils.SerialPortUtil
 
 
 /**
- * Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed2MainLayBinding>
- *     Callingbed2ActivityPresenter: 位置com.wdkl.ncs.android.middleware.logic.presenter.callingbed2
+ * CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingbed2MainLayBinding>
+ *     CallingdoorActivityPresenter: 位置com.wdkl.ncs.android.middleware.logic.presenter.callingbed2
  *     Callingbed2MainLayBinding: 位置callingbed2_main_lay.xml
- *     Callingbed2ActivityContract: 位置com.wdkl.ncs.android.middleware.logic.contract.callingbed2
+ *     CallingdoorActivityContract: 位置com.wdkl.ncs.android.middleware.logic.contract.callingbed2
  */
 
-@Router(path = "/callingbed2/main")
-class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed2MainLayBinding>(), Callingbed2ActivityContract.View, Callingbed2Agreement,
+@Router(path = "/callingdoor/main")
+class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, CallingdoorMainLayBinding>(), CallingdoorActivityContract.View, CallingdoorAgreement,
         /*IEventListener,*/ SerialPortUtil.ISerialPortBedOnclickEvent, SerialPortUtil.ISerialPortBedOnclickString, IUserState {
 
     private lateinit var receiver: TimeReceiver
@@ -113,11 +107,11 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
     private var netErrCount : Int = 0
 
     override fun getLayId(): Int {
-        return R.layout.callingbed2_main_lay;
+        return R.layout.callingdoor_main_lay;
     }
 
     override fun bindDagger() {
-        Callingbed2Launch.component.inject(this)
+        CallingdoorLaunch.component.inject(this)
     }
 
     override fun init() {
@@ -145,8 +139,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
 
         //串口监听
         setSerialListner()
-        //打开手柄mic
-        SerialPortHelper.setHandsMIC(true)
 
         initDevice()
 
@@ -154,10 +146,14 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
         updateNetState()
 
         //启动主fragment
-        switchFragment(R.id.callingbed2_main_frame, MainFragment(), mainFragment)
+        switchFragment(R.id.callingdoor_main_frame, MainFragment(), mainFragment)
 
-        SerialPortHelper.setCallStatus("0")
+        //打开MIC
+        SerialPortHelper.setMIC(true)
+        SerialPortHelper.setHandsFree(true)
         SerialPortHelper.setSosLight("0")
+        //默认门灯白色
+        SerialPortHelper.setDoorLight(1, "111")
     }
 
     override fun userLogin() {
@@ -185,21 +181,21 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
         tv_btn_home.setOnClickListener {
             //首页
             if (!mainFragment.equals(curFragment)) {
-                switchFragment(R.id.callingbed2_main_frame, MainFragment(), mainFragment)
+                switchFragment(R.id.callingdoor_main_frame, MainFragment(), mainFragment)
             }
         }
 
         tv_btn_more.setOnClickListener {
             //更多
             if (!qrFragment.equals(curFragment)) {
-                switchFragment(R.id.callingbed2_main_frame, QrCodeFragment(), qrFragment)
+                switchFragment(R.id.callingdoor_main_frame, QrCodeFragment(), qrFragment)
             }
         }
 
         tv_btn_cost.setOnClickListener {
             //费用
             if (!costFragment.equals(curFragment)) {
-                switchFragment(R.id.callingbed2_main_frame, CostFragment(), costFragment)
+                switchFragment(R.id.callingdoor_main_frame, CostFragment(), costFragment)
             }
         }
 
@@ -273,7 +269,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
                 VoiceUtil.cancelAudioCall(Constant.DEVICE_ID)
                 //endCall()
                 CallDialogHelper.dismissCallDialog()
-                SerialPortHelper.setCallStatus("0")
             }
         }
     }
@@ -473,7 +468,7 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
     }
 
     fun startToActivity(intent: Intent) {
-        AppTool.Setting.startNewActivity(this@Callingbed2Activity, intent)
+        AppTool.Setting.startNewActivity(this@CallingdoorActivity, intent)
     }
 
     fun startTcp() {
@@ -567,7 +562,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
         CallDialogHelper.dismissCallDialog()
         Constant.CALL_STATE = Constant.CALL_STANDBY
         countDownTimer.cancel()
-        SerialPortHelper.setCallStatus("0")
     }
 
     //进入通话
@@ -576,7 +570,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
         CallDialogHelper.dismissCallDialog()
         Constant.CALL_STATE = Constant.CALL_CALLING
         countDownTimer.cancel()
-        SerialPortHelper.setCallStatus("2")
     }
 
     //挂断通话
@@ -584,7 +577,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
         VoiceUtil.handoffAudioCall(Constant.DEVICE_ID, Constant.fromId, Constant.interactionId)
         SocketManager.getInstance().endCall()
         Constant.CALL_STATE = Constant.CALL_STANDBY
-        SerialPortHelper.setCallStatus("0")
     }
 
     //来电拒接
@@ -592,7 +584,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
         VoiceUtil.rejectAudioCall(Constant.DEVICE_ID, Constant.fromId, Constant.interactionId)
         CallDialogHelper.dismissCallDialog()
         Constant.CALL_STATE = Constant.CALL_STANDBY
-        SerialPortHelper.setCallStatus("0")
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -630,10 +621,9 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
                                 Constant.fromId = tcpModel.fromId
                                 Constant.interactionId = interactionVO.id
                                 Constant.CALL_STATE = Constant.CALL_INCOMING
-                                SerialPortHelper.setCallStatus("1")
 
                                 CallDialogHelper.dismissCallDialog()
-                                CallDialogHelper.showCallDialog(this@Callingbed2Activity, 1, View.OnClickListener {
+                                CallDialogHelper.showCallDialog(this@CallingdoorActivity, 1, View.OnClickListener {
                                     //呼出取消
                                 }, View.OnClickListener {
                                     //来电接听
@@ -650,7 +640,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
                             CallDialogHelper.dismissCallDialog()
                             countDownTimer.cancel()
                             Constant.CALL_STATE = Constant.CALL_CALLING
-                            SerialPortHelper.setCallStatus("2")
 
                             if (Constant.CALL_TYPE == Constant.VIDEO_CALL) {
                                 CallSingleActivity.openActivity(this, interactionVO.toSipId, true, interactionVO.toSipId, false, false)
@@ -666,7 +655,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
                             Constant.CALL_STATE = Constant.CALL_STANDBY
                             CallDialogHelper.dismissCallDialog()
                             countDownTimer.cancel()
-                            SerialPortHelper.setCallStatus("0")
                         } else if (tcpModel.getAction() == TcpAction.VoiceAction.CALLING) {
                             //我方呼出，对方通话中
                             showMessage("对方正在忙线中，暂时无法接听!")
@@ -680,10 +668,9 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
                             //tv_call_state.setText("呼叫成功，请等待...")
                             countDownTimer.start()
                             Constant.CALL_STATE = Constant.CALL_OUTGOING
-                            SerialPortHelper.setCallStatus("1")
 
                             CallDialogHelper.dismissCallDialog()
-                            CallDialogHelper.showCallDialog(this@Callingbed2Activity, 0, View.OnClickListener {
+                            CallDialogHelper.showCallDialog(this@CallingdoorActivity, 0, View.OnClickListener {
                                 //呼出取消
                                 cancelCall()
                             }, View.OnClickListener {
@@ -697,7 +684,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
                             //MediaPlayHelper.getInstance().stopMusic()
                             //endCall()
                             Constant.CALL_STATE = Constant.CALL_STANDBY
-                            SerialPortHelper.setCallStatus("0")
                         } else if (tcpModel.getAction() == TcpAction.VoiceAction.HANDOFF) {
                             //对方挂断，不论我方呼出或呼入
                             //MediaPlayHelper.getInstance().stopMusic()
@@ -706,7 +692,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
                             Constant.CALL_STATE = Constant.CALL_STANDBY
                             CallDialogHelper.dismissCallDialog()
                             countDownTimer.cancel()
-                            SerialPortHelper.setCallStatus("0")
                         } else if (tcpModel.getAction() == TcpAction.VoiceAction.CANCEL) {
                             //对方呼叫时取消
                             //MediaPlayHelper.getInstance().stopMusic()
@@ -715,7 +700,6 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
                             Constant.CALL_STATE = Constant.CALL_STANDBY
                             CallDialogHelper.dismissCallDialog()
                             countDownTimer.cancel()
-                            SerialPortHelper.setCallStatus("0")
                         }
                     } else if (tcpModel.type == TcpType.SOS) {
                         if (tcpModel.action == TcpAction.SOSAction.CANCEL) {
@@ -903,7 +887,7 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
                     AppUpdateHelper.reboot(this)
                 }, 5000)
             } else {
-                WarningDialogHelper.showDialog(this@Callingbed2Activity)
+                WarningDialogHelper.showDialog(this@CallingdoorActivity)
             }
         }
     }

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/adapter/ActionAdapter.kt

@@ -1,8 +1,7 @@
-package com.wdkl.app.ncs.callingbed2.adapter
+package com.wdkl.app.ncs.callingdoor.adapter
 
 import android.content.Context
 import android.support.v7.widget.RecyclerView
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,7 +9,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.wdkl.app.ncs.callingbed2.R
+import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.ncs.android.middleware.api.UrlManager
 import com.wdkl.ncs.android.middleware.model.ActionItem
 

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/adapter/CallRecordsItemAdapter.kt

@@ -1,28 +1,16 @@
 package com.wdkl.ncs.android.component.nursehome.adapter
 
-import android.content.Intent
-import android.support.v4.content.ContextCompat.startActivity
-import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.wdkl.app.ncs.callingbed2.R
-import com.wdkl.app.ncs.callingbed2.databinding.AdapterCallRecordsItemBinding
+import com.wdkl.app.ncs.callingdoor.R
+import com.wdkl.app.ncs.callingdoor.databinding.AdapterCallRecordsItemBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.TimeHandle
-import com.wdkl.ncs.android.lib.utils.showMessage
-import com.wdkl.ncs.android.middleware.common.Constant
-import com.wdkl.ncs.android.middleware.logic.contract.shop.ShopCategoryActivityContract
-import com.wdkl.ncs.android.middleware.model.dos.CallingHistoryDO
-import com.wdkl.ncs.android.middleware.model.dos.InteractionDO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
-import com.wdkl.ncs.android.middleware.tcp.TcpClient
-import com.wdkl.ncs.android.middleware.tcp.channel.EventUtil
-import com.wdkl.ncs.android.middleware.tcp.channel.ImUtil
-import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
 
 /**

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/adapter/CostItemAdapter.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.adapter
+package com.wdkl.app.ncs.callingdoor.adapter
 
 import android.content.Context
 import android.support.v7.widget.LinearLayoutManager
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import com.wdkl.app.ncs.callingbed2.R
+import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfigByGroupNameVO
 import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfigVO
 

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/adapter/EventHistoryAdapter.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.adapter
+package com.wdkl.app.ncs.callingdoor.adapter
 
 import android.content.Context
 import android.support.v7.widget.RecyclerView
@@ -7,7 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import com.wdkl.app.ncs.callingbed2.R
+import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.ncs.android.middleware.model.EventHistoryItem
 
 class EventHistoryAdapter : RecyclerView.Adapter<EventHistoryAdapter.ViewHolder>{

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/adapter/NurseConfigAdpter.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.adapter
+package com.wdkl.app.ncs.callingdoor.adapter
 
 import android.content.Context
 import android.graphics.Color
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import com.wdkl.app.ncs.callingbed2.R
+import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
 import java.lang.Exception
 

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/agreement/Callingbed2Agreement.kt

@@ -1,8 +1,8 @@
-package com.wdkl.app.ncs.callingbed2.agreement
+package com.wdkl.app.ncs.callingdoor.agreement
 
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
 
-interface Callingbed2Agreement {
+interface CallingdoorAgreement {
 
     //更新护理数据
     fun updateNurseConfig(list: List<NurseConfigDto>)

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/di/Callingbed2Component.kt

@@ -1,14 +1,14 @@
-package com.wdkl.app.ncs.callingbed2.di
+package com.wdkl.app.ncs.callingdoor.di
 
-import com.wdkl.app.ncs.callingbed2.activity.AppUpdateActivity
-import com.wdkl.app.ncs.callingbed2.activity.Callingbed2Activity
-import com.wdkl.app.ncs.callingbed2.fragment.*
+import com.wdkl.app.ncs.callingdoor.activity.AppUpdateActivity
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity
+import com.wdkl.app.ncs.callingdoor.fragment.*
 import com.wdkl.ncs.android.middleware.di.ApplicationComponent
 import dagger.Component
 
 @Component(dependencies = arrayOf(ApplicationComponent::class))
-interface Callingbed2Component {
-    fun inject(activity: Callingbed2Activity)
+interface CallingdoorComponent {
+    fun inject(activity: CallingdoorActivity)
 
     fun inject(activity: AppUpdateActivity)
 

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/fragment/CallFragment.kt

@@ -1,32 +1,27 @@
-package com.wdkl.app.ncs.callingbed2.fragment
+package com.wdkl.app.ncs.callingdoor.fragment
 
 import android.os.CountDownTimer
 import android.os.SystemClock
-import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
-import com.wdkl.app.ncs.callingbed2.R
-import com.wdkl.app.ncs.callingbed2.activity.Callingbed2Activity
-import com.wdkl.app.ncs.callingbed2.agreement.Callingbed2Agreement
-import com.wdkl.app.ncs.callingbed2.databinding.VoiceCallLayBinding
-import com.wdkl.app.ncs.callingbed2.helper.MediaPlayHelper
-import com.wdkl.app.ncs.callingbed2.helper.SoundPoolManager
-import com.wdkl.app.ncs.callingbed2.launch.Callingbed2Launch
-import com.wdkl.app.ncs.callingbed2.settings.SettingConfig
+import com.wdkl.app.ncs.callingdoor.R
+import com.wdkl.app.ncs.callingdoor.databinding.VoiceCallLayBinding
+import com.wdkl.app.ncs.callingdoor.helper.MediaPlayHelper
+import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
+import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 //import com.wdkl.app.ncs.sip.event.AEvent
 //import com.wdkl.app.ncs.sip.event.IEventListener
 //import com.wdkl.app.ncs.sip.helper.StarRtcHelper
 import com.wdkl.ncs.android.lib.base.BaseFragment
-import com.wdkl.ncs.android.lib.utils.debugLog
 import com.wdkl.ncs.android.lib.utils.errorLog
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
-import com.wdkl.ncs.android.middleware.logic.contract.callingbed2.CallFragmentContract
-import com.wdkl.ncs.android.middleware.logic.presenter.callingbed2.MainFragmentPresenter
+import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.CallFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.MainFragmentPresenter
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
@@ -62,7 +57,7 @@ class CallFragment : BaseFragment<MainFragmentPresenter, VoiceCallLayBinding>(),
     }
 
     override fun bindDagger() {
-        Callingbed2Launch.component.inject(this)
+        CallingdoorLaunch.component.inject(this)
     }
 
     override fun init() {

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/fragment/CostFragment.kt

@@ -1,18 +1,18 @@
-package com.wdkl.app.ncs.callingbed2.fragment
+package com.wdkl.app.ncs.callingdoor.fragment
 
 import android.support.v7.widget.LinearLayoutManager
 import com.enation.javashop.net.engine.model.NetState
-import com.wdkl.app.ncs.callingbed2.R
-import com.wdkl.app.ncs.callingbed2.adapter.CostItemAdapter
-import com.wdkl.app.ncs.callingbed2.databinding.CostViewLayBinding
-import com.wdkl.app.ncs.callingbed2.launch.Callingbed2Launch
+import com.wdkl.app.ncs.callingdoor.R
+import com.wdkl.app.ncs.callingdoor.adapter.CostItemAdapter
+import com.wdkl.app.ncs.callingdoor.databinding.CostViewLayBinding
+import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.errorLog
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.common.Constant
-import com.wdkl.ncs.android.middleware.logic.contract.callingbed2.CostFragmentContract
-import com.wdkl.ncs.android.middleware.logic.presenter.callingbed2.CostFragmentPresenter
+import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.CostFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.CostFragmentPresenter
 import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfigByGroupNameVO
 import kotlinx.android.synthetic.main.cost_view_lay.*
 
@@ -23,7 +23,7 @@ class CostFragment : BaseFragment<CostFragmentPresenter, CostViewLayBinding>(),
     }
 
     override fun bindDagger() {
-        Callingbed2Launch.component.inject(this)
+        CallingdoorLaunch.component.inject(this)
     }
 
     override fun init() {

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

@@ -1,25 +1,22 @@
-package com.wdkl.app.ncs.callingbed2.fragment
+package com.wdkl.app.ncs.callingdoor.fragment
 
 import android.text.TextUtils
 import android.text.method.ScrollingMovementMethod
 import android.view.View
 import com.enation.javashop.net.engine.model.NetState
-import com.wdkl.app.ncs.callingbed2.R
-import com.wdkl.app.ncs.callingbed2.activity.Callingbed2Activity
-import com.wdkl.app.ncs.callingbed2.databinding.MainView2LayoutBinding
-import com.wdkl.app.ncs.callingbed2.helper.HttpHelper
-import com.wdkl.app.ncs.callingbed2.launch.Callingbed2Launch
+import com.wdkl.app.ncs.callingdoor.R
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity
+import com.wdkl.app.ncs.callingdoor.databinding.MainView2LayoutBinding
+import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.TimeHandle
-import com.wdkl.ncs.android.lib.utils.debugLog
 import com.wdkl.ncs.android.lib.utils.errorLog
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
-import com.wdkl.ncs.android.middleware.logic.contract.callingbed2.MainFragmentContract
-import com.wdkl.ncs.android.middleware.logic.presenter.callingbed2.MainFragmentPresenter
-import com.wdkl.ncs.android.middleware.model.dos.EventDO
+import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.MainFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.MainFragmentPresenter
 import com.wdkl.ncs.android.middleware.model.vo.CustomerInfoVO
 import kotlinx.android.synthetic.main.main_view2_layout.*
 import kotlinx.android.synthetic.main.view_bed_name.*
@@ -36,7 +33,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainView2LayoutBinding>(
     }
 
     override fun bindDagger() {
-        Callingbed2Launch.component.inject(this)
+        CallingdoorLaunch.component.inject(this)
     }
 
     override fun init() {
@@ -85,7 +82,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainView2LayoutBinding>(
 
         //更新护理项
         if (customInfo.list != null) {
-            (activity as Callingbed2Activity).updateNurseConfig(customInfo.list)
+            (activity as CallingdoorActivity).updateNurseConfig(customInfo.list)
         }
     }
 

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

@@ -1,20 +1,19 @@
-package com.wdkl.app.ncs.callingbed2.fragment
+package com.wdkl.app.ncs.callingdoor.fragment
 
-import android.graphics.BitmapFactory
 import com.enation.javashop.net.engine.model.NetState
-import com.wdkl.app.ncs.callingbed2.BuildConfig
-import com.wdkl.app.ncs.callingbed2.R
-import com.wdkl.app.ncs.callingbed2.activity.Callingbed2Activity
-import com.wdkl.app.ncs.callingbed2.databinding.QrCodeLayBinding
-import com.wdkl.app.ncs.callingbed2.helper.AppUpdateHelper
-import com.wdkl.app.ncs.callingbed2.helper.NetHelper
-import com.wdkl.app.ncs.callingbed2.launch.Callingbed2Launch
+import com.wdkl.app.ncs.callingdoor.BuildConfig
+import com.wdkl.app.ncs.callingdoor.R
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity
+import com.wdkl.app.ncs.callingdoor.databinding.QrCodeLayBinding
+import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper
+import com.wdkl.app.ncs.callingdoor.helper.NetHelper
+import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.common.Constant
-import com.wdkl.ncs.android.middleware.logic.contract.callingbed2.QrCodeFragmentContract
-import com.wdkl.ncs.android.middleware.logic.presenter.callingbed2.QrCodeFragmentPresenter
+import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.QrCodeFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.QrCodeFragmentPresenter
 import kotlinx.android.synthetic.main.qr_code_lay.*
 import kotlinx.android.synthetic.main.view_bed_name.*
 import java.lang.StringBuilder
@@ -30,7 +29,7 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
     }
 
     override fun bindDagger() {
-        Callingbed2Launch.component.inject(this)
+        CallingdoorLaunch.component.inject(this)
     }
 
     override fun init() {
@@ -71,7 +70,7 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
     override fun bindEvent() {
         //debugLog(TAG,"bindEvent")
         tv_btn_update_app.setOnClickListener {
-            (activity as Callingbed2Activity).checkAppVersion()
+            (activity as CallingdoorActivity).checkAppVersion()
         }
 
         tv_btn_reboot.setOnClickListener {

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/fragment/VoiceMsgFragment.kt

@@ -1,14 +1,13 @@
-package com.wdkl.app.ncs.callingbed2.fragment
+package com.wdkl.app.ncs.callingdoor.fragment
 
 import android.os.SystemClock
 import android.view.MotionEvent
 import com.enation.javashop.net.engine.model.NetState
-import com.wdkl.app.ncs.callingbed2.R
-import com.wdkl.app.ncs.callingbed2.databinding.VoiceMsgLayBinding
-import com.wdkl.app.ncs.callingbed2.helper.HttpHelper
-import com.wdkl.app.ncs.callingbed2.helper.MediaPlayHelper
-import com.wdkl.app.ncs.callingbed2.helper.RecordHelper
-import com.wdkl.app.ncs.callingbed2.launch.Callingbed2Launch
+import com.wdkl.app.ncs.callingdoor.R
+import com.wdkl.app.ncs.callingdoor.databinding.VoiceMsgLayBinding
+import com.wdkl.app.ncs.callingdoor.helper.HttpHelper
+import com.wdkl.app.ncs.callingdoor.helper.RecordHelper
+import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.debugLog
 import com.wdkl.ncs.android.lib.utils.errorLog
@@ -16,8 +15,8 @@ import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.api.UrlManager
 import com.wdkl.ncs.android.middleware.common.Constant
-import com.wdkl.ncs.android.middleware.logic.contract.callingbed2.VoiceFragmentContract
-import com.wdkl.ncs.android.middleware.logic.presenter.callingbed2.VoiceFragmentPresenter
+import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.VoiceFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.VoiceFragmentPresenter
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.channel.ImUtil
 import kotlinx.android.synthetic.main.voice_msg_lay.*
@@ -40,7 +39,7 @@ class VoiceMsgFragment @Inject constructor() : BaseFragment<VoiceFragmentPresent
     }
 
     override fun bindDagger() {
-        Callingbed2Launch.component.inject(this)
+        CallingdoorLaunch.component.inject(this)
     }
 
     override fun init() {

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/AnrFcExceptionUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.app.Application;
 import android.os.Environment;

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/AppUpdateHelper.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.content.Context;
 import android.content.Intent;

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/CallDialogHelper.java

@@ -1,11 +1,8 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
 import android.media.AudioManager;
-import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,9 +11,8 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 
-import com.wdkl.app.ncs.callingbed2.R;
+import com.wdkl.app.ncs.callingdoor.R;
 import com.wdkl.core.voip.AsyncPlayer;
 
 public class CallDialogHelper {

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/HttpHelper.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.util.Log;
 
@@ -15,10 +15,9 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.ResponseBody;
 
-import static com.wdkl.app.ncs.callingbed2.helper.AppUpdateHelper.FILE_APK_NAME;
-import static com.wdkl.app.ncs.callingbed2.helper.AppUpdateHelper.FILE_APK_PATH;
+import static com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper.FILE_APK_NAME;
+import static com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper.FILE_APK_PATH;
 
 public class HttpHelper {
 

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/MediaPlayHelper.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.media.AudioManager;
 import android.media.MediaPlayer;

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/NetHelper.java

@@ -1,8 +1,7 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiInfo;

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/RecordHelper.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.media.MediaRecorder;
 import android.os.Environment;

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/SOSHelper.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.os.Handler;
 import android.os.Looper;

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/ScreenManagerUtil.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper
+package com.wdkl.app.ncs.callingdoor.helper
 
 import android.content.Context
 import android.content.Intent

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/SerialPortHelper.java

@@ -0,0 +1,56 @@
+package com.wdkl.app.ncs.callingdoor.helper;
+
+import serialporttest.utils.SerialPortUtil;
+
+public class SerialPortHelper {
+
+    /**
+     * 麦克风切换控制
+     */
+    public static void setMIC(boolean mainMIC) {
+        if (mainMIC) {
+            SerialPortUtil.getInstance().sendCommand(SerialPortUtil.MIC, "0", "F");
+        } else {
+            SerialPortUtil.getInstance().sendCommand(SerialPortUtil.MIC, "1", "F");
+        }
+    }
+
+    /**
+     * 设置免提
+     */
+    public static void setHandsFree(boolean isHandsFree) {
+        if (isHandsFree) {
+            SerialPortUtil.getInstance().sendCommand(SerialPortUtil.AUDIO, "0", "F");
+        } else {
+            SerialPortUtil.getInstance().sendCommand(SerialPortUtil.AUDIO, "1", "F");
+        }
+    }
+
+    /**
+     * 门灯控制开关
+     *
+     * @param data  0  表示灯灭   1  表示常亮    2 表示闪烁
+     * @param color 0 表示灯灭  非0表示灯的颜色
+     */
+    public static void setDoorLight(int data, String color) {
+        String command;
+        if (data == 0 || color == null) {
+            command = "000";
+        } else {
+            command = color;
+        }
+        SerialPortUtil.getInstance().sendCommand(SerialPortUtil.DOORLIGHT, command, "F");
+    }
+
+    /**
+     * 设置卫生间紧急按钮灯状态: 0关闭1打开2闪烁
+     */
+    public static void setSosLight(String state) {
+        SerialPortUtil.getInstance().sendCommand(SerialPortUtil.ULED, state, "F");
+    }
+
+    //重置设备
+    public static void resetDevice() {
+        SerialPortUtil.getInstance().sendCommand(SerialPortUtil.NET_STATUS , "1", "F");
+    }
+}

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/SoundPoolManager.java

@@ -1,11 +1,11 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.SoundPool;
 import android.os.Build;
 
-import com.wdkl.app.ncs.callingbed2.R;
+import com.wdkl.app.ncs.callingdoor.R;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
 
 import java.util.HashMap;

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/Utils.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.hardware.Camera;
 

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/VoiceManagerUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.content.Context;
 import android.media.AudioManager;

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/helper/WarningDialogHelper.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -9,7 +9,7 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
 
-import com.wdkl.app.ncs.callingbed2.R;
+import com.wdkl.app.ncs.callingdoor.R;
 
 public class WarningDialogHelper {
     private static AlertDialog dialog;

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/launch/CallingdoorLaunch.kt

@@ -0,0 +1,20 @@
+package com.wdkl.app.ncs.callingdoor.launch
+
+import com.enation.javashop.android.jrouter.external.annotation.Router
+import com.wdkl.app.ncs.callingdoor.di.CallingdoorComponent
+import com.wdkl.app.ncs.callingdoor.di.DaggerCallingdoorComponent
+import com.wdkl.ncs.android.lib.base.BaseLaunch
+import com.wdkl.ncs.android.middleware.di.DaggerManager
+
+@Router(path = "/callingdoor/launch")
+class CallingdoorLaunch :BaseLaunch() {
+    companion object {
+        lateinit var component:CallingdoorComponent
+    }
+
+    override fun moduleInit() {
+        component = DaggerCallingdoorComponent.builder()
+                .applicationComponent(DaggerManager.APPLICATION_COMPONENT)
+                .build()
+    }
+}

callingbed2/src/main/java/com/wdkl/app/ncs/callingbed2/settings/SettingConfig.java

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.settings;
+package com.wdkl.app.ncs.callingdoor.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;

callingbed2/src/main/res/layout/callingbed2_main_lay.xml

@@ -118,7 +118,7 @@
 
         <!--右侧fragment区域-->
         <FrameLayout
-            android:id="@+id/callingbed2_main_frame"
+            android:id="@+id/callingdoor_main_frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginTop="10dp"