# 修改包名

app/build.gradle

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

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

@@ -5,11 +5,9 @@ import com.enation.javashop.android.jrouter.JRouter
 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.conversion_box.helper.AnrFcExceptionUtil
+import com.wdkl.app.ncs.conversion_box.helper.NetHelper
+import com.wdkl.app.ncs.conversion_box.helper.Utils
 import com.wdkl.core.socket.SocketManager
 import com.wdkl.core.voip.VoipEvent
 import com.wdkl.net.HttpRequestPresenter
@@ -58,7 +56,7 @@ class Application : BaseApplication() {
 
         //JRouter.prepare().create("/hello/launch").seek()
 
-        JRouter.prepare().create("/callingbed2/launch").seek()
+        JRouter.prepare().create("/conversion_box/launch").seek()
     }
 
     /**

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 6
+    ext.app_version_code = 1
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.0.6"
+    ext.app_version = "1.0.1"
 
     /**
      * 项目依赖库

callingbed2/build.gradle

@@ -22,7 +22,7 @@ android {
 
     defaultConfig {
         if (componentTag){
-            applicationId "com.wdkl.app.ncs.callingbed2"
+            applicationId "com.wdkl.app.ncs.conversion_box"
             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.conversion_box
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

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.conversion_box">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -13,11 +13,11 @@
         android:label="@string/app_name"
         android:supportsRtl="true" >
 
-        <activity android:name=".activity.Callingbed2Activity"
+        <activity android:name="com.wdkl.app.ncs.conversion_box.activity.MainActivity"
             android:launchMode="singleInstance"
             android:screenOrientation="landscape"/>
 
-        <activity android:name=".activity.AppUpdateActivity"
+        <activity android:name="com.wdkl.app.ncs.conversion_box.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.conversion_box.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.conversion_box.R
+import com.wdkl.app.ncs.conversion_box.databinding.UpdateLayBinding
+import com.wdkl.app.ncs.conversion_box.helper.AppUpdateHelper
+import com.wdkl.app.ncs.conversion_box.helper.HttpHelper
+import com.wdkl.app.ncs.conversion_box.launch.MainLaunch
 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.conversion_box.AppUpdateContract
+import com.wdkl.ncs.android.middleware.logic.presenter.conversion_box.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)
+        MainLaunch.component.inject(this)
     }
 
     override fun init() {

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

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.activity
+package com.wdkl.app.ncs.conversion_box.activity
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -14,15 +14,15 @@ import android.view.View
 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.callingbed2.R
-import com.wdkl.app.ncs.callingbed2.adapter.NurseConfigAdpter
-import com.wdkl.app.ncs.callingbed2.agreement.Callingbed2Agreement
-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.conversion_box.BuildConfig
+import com.wdkl.app.ncs.conversion_box.R
+import com.wdkl.app.ncs.conversion_box.adapter.NurseConfigAdpter
+import com.wdkl.app.ncs.conversion_box.agreement.Callingbed2Agreement
+import com.wdkl.app.ncs.conversion_box.databinding.Callingbed2MainLayBinding
+import com.wdkl.app.ncs.conversion_box.fragment.*
+import com.wdkl.app.ncs.conversion_box.helper.*
+import com.wdkl.app.ncs.conversion_box.launch.MainLaunch
+import com.wdkl.app.ncs.conversion_box.settings.SettingConfig
 import com.wdkl.core.consts.Urls
 import com.wdkl.core.socket.IUserState
 import com.wdkl.core.socket.SocketManager
@@ -33,8 +33,8 @@ 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.conversion_box.MainActivityContract
+import com.wdkl.ncs.android.middleware.logic.presenter.conversion_box.MainActivityPresenter
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
@@ -56,15 +56,8 @@ import org.greenrobot.eventbus.ThreadMode
 import serialporttest.utils.SerialPortUtil
 
 
-/**
- * Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed2MainLayBinding>
- *     Callingbed2ActivityPresenter: 位置com.wdkl.ncs.android.middleware.logic.presenter.callingbed2
- *     Callingbed2MainLayBinding: 位置callingbed2_main_lay.xml
- *     Callingbed2ActivityContract: 位置com.wdkl.ncs.android.middleware.logic.contract.callingbed2
- */
-
-@Router(path = "/callingbed2/main")
-class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed2MainLayBinding>(), Callingbed2ActivityContract.View, Callingbed2Agreement,
+@Router(path = "/conversion_box/main")
+class MainActivity :BaseActivity<MainActivityPresenter, Callingbed2MainLayBinding>(), MainActivityContract.View, Callingbed2Agreement,
         /*IEventListener,*/ SerialPortUtil.ISerialPortBedOnclickEvent, SerialPortUtil.ISerialPortBedOnclickString, IUserState {
 
     private lateinit var receiver: TimeReceiver
@@ -95,7 +88,7 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
     }
 
     override fun bindDagger() {
-        Callingbed2Launch.component.inject(this)
+        MainLaunch.component.inject(this)
     }
 
     override fun init() {
@@ -414,7 +407,7 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
     }
 
     fun startToActivity(intent: Intent) {
-        AppTool.Setting.startNewActivity(this@Callingbed2Activity, intent)
+        AppTool.Setting.startNewActivity(this@MainActivity, intent)
     }
 
     fun startTcp() {
@@ -706,7 +699,7 @@ class Callingbed2Activity :BaseActivity<Callingbed2ActivityPresenter, Callingbed
                         AppUpdateHelper.reboot(this)
                     }, 5000)
                 } else {
-                    WarningDialogHelper.showDialog(this@Callingbed2Activity)
+                    WarningDialogHelper.showDialog(this@MainActivity)
                 }
             }
         }

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.conversion_box.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.conversion_box.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.conversion_box.R
+import com.wdkl.app.ncs.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.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,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.agreement
+package com.wdkl.app.ncs.conversion_box.agreement
 
 import com.wdkl.ncs.android.middleware.model.dto.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.conversion_box.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.conversion_box.activity.AppUpdateActivity
+import com.wdkl.app.ncs.conversion_box.activity.MainActivity
+import com.wdkl.app.ncs.conversion_box.fragment.*
 import com.wdkl.ncs.android.middleware.di.ApplicationComponent
 import dagger.Component
 
 @Component(dependencies = arrayOf(ApplicationComponent::class))
 interface Callingbed2Component {
-    fun inject(activity: Callingbed2Activity)
+    fun inject(activity: MainActivity)
 
     fun inject(activity: AppUpdateActivity)
 

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

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.fragment
+package com.wdkl.app.ncs.conversion_box.fragment
 
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -8,21 +8,18 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import com.enation.javashop.utils.base.tool.BaseToolActivity
-import com.wdkl.app.ncs.callingbed2.helper.RingPlayHelper
-import com.wdkl.app.ncs.callingbed2.helper.SerialPortHelper
-import com.wdkl.app.ncs.callingbed2.settings.SettingConfig
+import com.wdkl.app.ncs.conversion_box.helper.RingPlayHelper
+import com.wdkl.app.ncs.conversion_box.helper.SerialPortHelper
+import com.wdkl.app.ncs.conversion_box.settings.SettingConfig
 import com.wdkl.core.voip.VoipEvent
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
-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
 import com.wdkl.skywebrtc.SkyEngineKit
 import com.wdkl.skywebrtc.except.NotInitializedException
 import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
 
 abstract class BaseCallFragment: Fragment() {
 

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.conversion_box.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.conversion_box.R
+import com.wdkl.app.ncs.conversion_box.databinding.VoiceCallLayBinding
+import com.wdkl.app.ncs.conversion_box.helper.MediaPlayHelper
+import com.wdkl.app.ncs.conversion_box.launch.MainLaunch
+import com.wdkl.app.ncs.conversion_box.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.conversion_box.CallFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.conversion_box.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)
+        MainLaunch.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.conversion_box.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.conversion_box.R
+import com.wdkl.app.ncs.conversion_box.adapter.CostItemAdapter
+import com.wdkl.app.ncs.conversion_box.databinding.CostViewLayBinding
+import com.wdkl.app.ncs.conversion_box.launch.MainLaunch
 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.conversion_box.CostFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.conversion_box.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)
+        MainLaunch.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.conversion_box.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.conversion_box.R
+import com.wdkl.app.ncs.conversion_box.activity.MainActivity
+import com.wdkl.app.ncs.conversion_box.databinding.MainView2LayoutBinding
+import com.wdkl.app.ncs.conversion_box.launch.MainLaunch
 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.conversion_box.MainFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.conversion_box.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)
+        MainLaunch.component.inject(this)
     }
 
     override fun init() {
@@ -81,7 +78,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainView2LayoutBinding>(
 
         //更新护理项
         if (customInfo.list != null) {
-            (activity as Callingbed2Activity).updateNurseConfig(customInfo.list)
+            (activity as MainActivity).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.conversion_box.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.conversion_box.BuildConfig
+import com.wdkl.app.ncs.conversion_box.R
+import com.wdkl.app.ncs.conversion_box.activity.MainActivity
+import com.wdkl.app.ncs.conversion_box.databinding.QrCodeLayBinding
+import com.wdkl.app.ncs.conversion_box.helper.AppUpdateHelper
+import com.wdkl.app.ncs.conversion_box.helper.NetHelper
+import com.wdkl.app.ncs.conversion_box.launch.MainLaunch
 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.conversion_box.QrCodeFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.conversion_box.QrCodeFragmentPresenter
 import kotlinx.android.synthetic.main.qr_code_lay.*
 import kotlinx.android.synthetic.main.view_bed_name.*
 import java.lang.StringBuilder
@@ -29,7 +28,7 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
     }
 
     override fun bindDagger() {
-        Callingbed2Launch.component.inject(this)
+        MainLaunch.component.inject(this)
     }
 
     override fun init() {
@@ -69,7 +68,7 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
 
     override fun bindEvent() {
         tv_btn_update_app.setOnClickListener {
-            (activity as Callingbed2Activity).checkAppVersion()
+            (activity as MainActivity).checkAppVersion()
         }
 
         tv_btn_reboot.setOnClickListener {

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

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.fragment
+package com.wdkl.app.ncs.conversion_box.fragment
 
 import android.os.Handler
 import android.os.Looper
@@ -7,10 +7,9 @@ import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import com.google.gson.Gson
-import com.wdkl.app.ncs.callingbed2.R
-import com.wdkl.app.ncs.callingbed2.helper.RingPlayHelper
-import com.wdkl.app.ncs.callingbed2.helper.SerialPortHelper
-import com.wdkl.core.socket.SocketManager
+import com.wdkl.app.ncs.conversion_box.R
+import com.wdkl.app.ncs.conversion_box.helper.RingPlayHelper
+import com.wdkl.app.ncs.conversion_box.helper.SerialPortHelper
 import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant

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.conversion_box.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.conversion_box.R
+import com.wdkl.app.ncs.conversion_box.databinding.VoiceMsgLayBinding
+import com.wdkl.app.ncs.conversion_box.helper.HttpHelper
+import com.wdkl.app.ncs.conversion_box.helper.RecordHelper
+import com.wdkl.app.ncs.conversion_box.launch.MainLaunch
 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.conversion_box.VoiceFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.conversion_box.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)
+        MainLaunch.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.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.helper.AppUpdateHelper.FILE_APK_NAME;
+import static com.wdkl.app.ncs.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.helper;
 
 import android.media.MediaRecorder;
 import android.os.Environment;

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

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

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.conversion_box.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.conversion_box.helper
 
 import android.content.Context
 import android.content.Intent

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

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper;
+package com.wdkl.app.ncs.conversion_box.helper;
 
 import serialporttest.utils.SerialPortUtil;
 

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.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.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.conversion_box.R;
 
 public class WarningDialogHelper {
     private static AlertDialog dialog;

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

@@ -1,13 +1,13 @@
-package com.wdkl.app.ncs.callingbed2.launch
+package com.wdkl.app.ncs.conversion_box.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.app.ncs.conversion_box.di.Callingbed2Component
+import com.wdkl.app.ncs.conversion_box.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() {
+@Router(path = "/conversion_box/launch")
+class MainLaunch :BaseLaunch() {
     companion object {
         lateinit var component:Callingbed2Component
     }

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.conversion_box.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;