修改编译错误问题

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/activity/AppUpdateActivity.kt

@@ -5,7 +5,6 @@ import android.util.Log
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
 import com.wdkl.ncs.android.component.nursehome.R
-import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.UpdateLayBinding
 import com.wdkl.ncs.android.component.nursehome.launch.NurseHomeLaunch
 import com.wdkl.ncs.android.component.nursehome.util.AppUpdateHelper
@@ -14,6 +13,7 @@ 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.Constants
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.AppUpdateContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.AppUpdatePresenter
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -24,7 +24,6 @@ import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
 import com.wdkl.ncs.android.component.nursehome.BuildConfig
 import com.wdkl.ncs.android.component.nursehome.R
-import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.ActivityNurseHomeBinding
 import com.wdkl.ncs.android.component.nursehome.fragment.*
 import com.wdkl.ncs.android.component.nursehome.launch.NurseHomeLaunch
@@ -33,11 +32,12 @@ import com.wdkl.ncs.android.component.nursehome.led.LedManagerUtils
 import com.wdkl.ncs.android.component.nursehome.settingconfig.SettingConfig
 import com.wdkl.ncs.android.component.nursehome.util.*
 import com.wdkl.ncs.android.component.nursehome.window.IncidentWindow
-import com.wdkl.ncs.android.component.nursehome.entity.CallingItem
 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.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.common.SipStatus
+import com.wdkl.ncs.android.middleware.entity.CallingItem
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.NurseHomeActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.NurseHomeActivityPresenter
 import com.wdkl.ncs.android.middleware.model.ServerInfo
@@ -48,6 +48,7 @@ import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
 import com.wdkl.ncs.android.middleware.model.vo.HostDevicePartSettingVO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
+import com.wdkl.ncs.android.middleware.model.vo.NurseDeviceInfoVO
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.channel.*
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
@@ -327,8 +328,8 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         var intentFilter = IntentFilter()
         intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION)
         //手柄状态监听
-        intentFilter.addAction(Constants.HOOK_OFF_ACTION)
-        intentFilter.addAction(Constants.HOOK_ON_ACTION)
+        intentFilter.addAction(Constants.HOOK_OFF)
+        intentFilter.addAction(Constants.HOOK_ON)
         registerReceiver(receiver, intentFilter)
     }
 
@@ -383,6 +384,14 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         }
     }
 
+    override fun showDeviceData(data: NurseDeviceInfoVO) {
+
+    }
+
+    override fun onNoneNet() {
+
+    }
+
     fun getLedList() : ArrayList<LedItem> {
         return ledList
     }

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/activity/RegisterActivity.kt

@@ -17,19 +17,16 @@ import com.wdkl.ncs.android.component.nursehome.launch.NurseHomeLaunch
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import io.reactivex.Observable
 import com.wdkl.ncs.android.component.nursehome.BuildConfig
-import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.util.AppUpdateHelper
 import com.wdkl.ncs.android.component.nursehome.util.NetHelper
 import com.wdkl.ncs.android.component.nursehome.util.ServerConfigDialogHelper
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.middleware.api.UrlManager
+import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.DeviceContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.DevicePresenter
 import com.wdkl.ncs.android.middleware.model.ThirdServerInfo
-import com.wdkl.ncs.android.middleware.model.bean.SettingConfiguration
-import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
-import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
 import com.wdkl.ncs.android.middleware.model.vo.NurseDeviceInfoVO
 import com.wdkl.ncs.android.middleware.udp.ServerInfoUtil
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
@@ -84,9 +81,9 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
     }
 
     private fun permissionGranted() {
-        Constants.mac = NetHelper.getInstance().macAddress
-        Log.e(TAG,"mac "+Constants.mac)
-        tv_local_mac.text = "本机MAC："+Constants.mac
+        Constants.device_serial_id = NetHelper.getInstance().macAddress
+        Log.e(TAG,"mac "+Constants.device_serial_id)
+        tv_local_mac.text = "本机MAC："+Constants.device_serial_id
 
         Thread{
             //val logoBitmap = BitmapFactory.decodeResource(resources, R.mipmap.erlogo)
@@ -95,7 +92,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
             builder.append("&code=")
             builder.append(Constants.DEVICE_CODE)
             builder.append("&mac=")
-            builder.append(Constants.mac)
+            builder.append(Constants.device_serial_id)
             builder.append("&model=")
             builder.append(Constants.DEVICE_MODEL)
             builder.append("&hard_ver=")
@@ -129,8 +126,6 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
             tv_app_version.text = str
         }
 
-        //presenter.loadData(Constants.mac!!)
-
         //检查服务器地址接口是否可用，可用则进入下一步获取设备信息，不可用则稍后再次尝试
         checkServer()
     }
@@ -139,7 +134,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
         tv_local_ip.text = "本机IP: " + NetHelper.getInstance().localIP + ", server: " + serverIp
 
         handler.postDelayed({
-            presenter.loadData(Constants.mac!!)
+            presenter.loadData(Constants.device_serial_id!!)
         }, 20000)
     }
 
@@ -184,15 +179,15 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
                     if (response != null && response.isSuccessful) {
                         //接口数据获取成功，进入下一步获取设备信息
                         serverSuccess = true
-                        presenter.loadData(Constants.mac!!)
+                        presenter.loadData(Constants.device_serial_id!!)
                     } else {
                         //接口数据获取失败，可能服务器ip不对，尝试重新获取服务器ip
-                        val info = ServerInfoUtil.get(Constants.mac!!)
+                        val info = ServerInfoUtil.get(Constants.device_serial_id!!)
                         checkServerInfo(info)
                     }
                 } catch (e: Exception) {
                     //接口数据获取失败，可能服务器ip不对，尝试重新获取服务器ip
-                    val info = ServerInfoUtil.get(Constants.mac!!)
+                    val info = ServerInfoUtil.get(Constants.device_serial_id!!)
                     checkServerInfo(info)
                     //e.printStackTrace()
                 }
@@ -264,7 +259,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
         Log.e(TAG,"收到返回的设备信息 "+data.id)
         Log.e(TAG,"收到返回的设备信息 "+data.sipId)
         Log.e(TAG,"收到返回的设备信息 "+data.toString())
-//        Constants.mac = "e8:11:ca:03:0d:fb"
+
         Constants.hospital_name = data.hospitalName
         Constants.part_name = data.partName
         Constants.partDisplay = data.partDisplay
@@ -315,13 +310,13 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
         btn_reload.isEnabled = false
         btn_reload.setOnClickListener {
             btn_reload.isEnabled = false
-            presenter.loadData(Constants.mac!!)
+            presenter.loadData(Constants.device_serial_id!!)
         }
 
         btn_get_server.setOnClickListener {
             btn_get_server.isEnabled = false
             Thread {
-                val info = ServerInfoUtil.get(Constants.mac!!)
+                val info = ServerInfoUtil.get(Constants.device_serial_id!!)
                 runOnUiThread {
                     btn_get_server.isEnabled = true
                     if (info != null) {

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/adapter/CallRecordsItemAdapter.kt

@@ -7,7 +7,6 @@ import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.activity.NurseHomeActivity
-import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.AdapterCallRecordsItemBinding
 import com.wdkl.ncs.android.component.nursehome.util.LedHelper
 import com.wdkl.ncs.android.component.nursehome.util.RingPlayHelper
@@ -16,8 +15,7 @@ import com.wdkl.ncs.android.component.nursehome.util.TimeTransition
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.showMessage
-import com.wdkl.ncs.android.middleware.model.dos.CallingHistoryDO
-import com.wdkl.ncs.android.middleware.model.vo.CallingHistoryVO
+import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil
 import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/adapter/CallingItemAdapter.kt

@@ -9,11 +9,11 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.activity.NurseHomeActivity
-import com.wdkl.ncs.android.component.nursehome.common.Constants
-import com.wdkl.ncs.android.component.nursehome.entity.CallingItem
 import com.wdkl.ncs.android.component.nursehome.util.RingPlayHelper
 import com.wdkl.ncs.android.component.nursehome.util.SpeechUtil
 import com.wdkl.ncs.android.component.nursehome.util.TimeTransition
+import com.wdkl.ncs.android.middleware.common.Constants
+import com.wdkl.ncs.android.middleware.entity.CallingItem
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import org.greenrobot.eventbus.EventBus

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/BaseCallFragment.kt

@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.enation.javashop.utils.base.tool.BaseToolActivity
-import com.wdkl.ncs.android.component.nursehome.common.Constants
+import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import org.greenrobot.eventbus.EventBus
 

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/CallRecordsFragment.kt

@@ -13,9 +13,7 @@ import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.activity.NurseHomeActivity
 import com.wdkl.ncs.android.component.nursehome.adapter.CallRecordsItemAdapter
 import com.wdkl.ncs.android.component.nursehome.adapter.CallingItemAdapter
-import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.FragmentCallRecordsBinding
-import com.wdkl.ncs.android.component.nursehome.entity.CallingItem
 import com.wdkl.ncs.android.component.nursehome.launch.NurseHomeLaunch
 import com.wdkl.ncs.android.component.nursehome.settingconfig.SettingConfig
 import com.wdkl.ncs.android.component.nursehome.util.LedHelper
@@ -24,6 +22,8 @@ import com.wdkl.ncs.android.component.nursehome.util.SpeechUtil
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
+import com.wdkl.ncs.android.middleware.common.Constants
+import com.wdkl.ncs.android.middleware.entity.CallingItem
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.CallRecordsFragmentContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.CallRecordsFragmentPresenter
 import com.wdkl.ncs.android.middleware.model.vo.EventVO

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/DoctorHostFragment.kt

@@ -17,6 +17,7 @@ import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.DoctorHostContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.DoctorHostPresenter
+import com.wdkl.ncs.android.middleware.model.dos.DeviceDO
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.fragment_doctor_host.*
@@ -139,11 +140,11 @@ class DoctorHostFragment: BaseFragment<DoctorHostPresenter, FragmentDoctorHostBi
      */
     override fun destory() {
     }
-    /**
-     *显示数据
-     */
-    override fun showData() {
+
+    override fun showDoctorDevices(devices: ArrayList<DeviceDO>) {
+
     }
+
     /**
      *处理错误信息
      */

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/FramePartFragment.kt

@@ -14,7 +14,6 @@ import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.activity.NurseHomeActivity
 import com.wdkl.ncs.android.component.nursehome.adapter.*
-import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.FragmentFramePartBinding
 import com.wdkl.ncs.android.component.nursehome.launch.NurseHomeLaunch
 import com.wdkl.ncs.android.component.nursehome.util.RingPlayHelper
@@ -25,6 +24,7 @@ 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.Constants
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.FramePartContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.FramePartPresenter
 import com.wdkl.ncs.android.middleware.model.bean.SettingConfiguration

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/LedSettingsFragment.kt

@@ -9,11 +9,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.SeekBar
 import com.enation.javashop.utils.base.tool.BaseToolActivity
-import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.wdkl.ncs.android.component.nursehome.R
-import com.wdkl.ncs.android.component.nursehome.activity.NurseHomeActivity
 import com.wdkl.ncs.android.component.nursehome.adapter.LedItemAdapter
-import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.led.LedItem
 import com.wdkl.ncs.android.component.nursehome.led.LedManagerUtils
 import com.wdkl.ncs.android.component.nursehome.settingconfig.SettingConfig

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/NurseMoveFragment.kt

@@ -16,6 +16,8 @@ import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.NurseMoveContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.NurseMovePresenter
+import com.wdkl.ncs.android.middleware.model.dos.FrameDO
+import com.wdkl.ncs.android.middleware.model.vo.WatchUsingVO
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.fragment_doctor_host.*
@@ -140,11 +142,15 @@ class NurseMoveFragment : BaseFragment<NurseMovePresenter,FragmentNurseMoveBindi
      */
     override fun destory() {
     }
-    /**
-     *显示数据
-     */
-    override fun showData() {
+
+    override fun showMobileDevice(data: ArrayList<WatchUsingVO>) {
+
     }
+
+    override fun showResponsibleBeds(beds: ArrayList<FrameDO>) {
+
+    }
+
     /**
      *处理错误信息
      */

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/OtherHostFragment.kt

@@ -15,6 +15,7 @@ import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.OtherHostContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.OtherHostPresenter
+import com.wdkl.ncs.android.middleware.model.dos.DeviceDO
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.fragment_nurse_move.*
@@ -97,11 +98,15 @@ class OtherHostFragment : BaseFragment<OtherHostPresenter,FragmentOtherHostBindi
      */
     override fun destory() {
     }
-    /**
-     *显示数据
-     */
-    override fun showData() {
+
+    override fun showDevice(devices: ArrayList<DeviceDO>) {
+
     }
+
+    override fun showAllHostDevice(devices: ArrayList<DeviceDO>) {
+
+    }
+
     /**
      *处理错误信息
      */

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/SkyCallFragment.kt

@@ -10,11 +10,11 @@ import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.google.gson.Gson
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.adapter.BedItemAdapter
-import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.util.RingPlayHelper
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.showMessage
+import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.model.bean.SettingConfiguration
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
@@ -124,7 +124,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
         videoRoomCallback = VideoRoomCallback(janusClient, room, Constants.sip_id!!.toBigInteger())
         videoRoomCallback!!.callSessionCallback = this
         janusClient!!.setJanusCallback(videoRoomCallback)
-        janusClient!!.connect()
+        janusClient!!.connect(-1, false)
     }
 
     private fun initCountDownTimer() {
@@ -156,9 +156,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
 
             //延迟发送
             Handler().postDelayed({ //发送探视邀请给分机
-                VideoUtil.sendInviteVideoCall(Constants.ids,
-                    bedVO.bedDeviceId,
-                    Constants.interactionId)
+                VideoUtil.sendInviteVideoCall(Constants.ids, bedVO.bedDeviceId, Constants.interactionId, Constants.targetSipId)
             }, 2000)
 
             //关闭主机和探视机的视频，然后由分机向探视机发视频通话

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/SystemSettingsFragment.kt

@@ -12,7 +12,6 @@ import com.enation.javashop.net.engine.model.NetState
 import com.wdkl.ncs.android.component.nursehome.BuildConfig
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.activity.NurseHomeActivity
-import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.FragmentSystemSettingsBinding
 import com.wdkl.ncs.android.component.nursehome.launch.NurseHomeLaunch
 import com.wdkl.ncs.android.component.nursehome.settingconfig.SettingConfig
@@ -22,6 +21,7 @@ import com.wdkl.ncs.android.component.nursehome.util.VoiceManagerUtil
 import com.wdkl.ncs.android.component.nursehome.util.WarningDialogHelper
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.showMessage
+import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.SystemSettingsContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.SystemSettingsPresenter
 import com.wdkl.ncs.android.middleware.model.bean.SettingConfiguration

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/led/LedC2MManager.java

@@ -9,9 +9,9 @@ import android.util.Log;
 
 import com.listenvision.LedC2M;
 import com.listenvision.model.VoiceModel;
-import com.wdkl.ncs.android.component.nursehome.common.Constants;
 import com.wdkl.ncs.android.component.nursehome.settingconfig.SettingConfig;
 import com.wdkl.ncs.android.lib.utils.ExtendMethodsKt;
+import com.wdkl.ncs.android.middleware.common.Constants;
 import com.wdkl.ncs.android.middleware.model.bean.SettingConfiguration;
 
 import java.io.File;

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/led/LedManager.java

@@ -2,7 +2,7 @@ package com.wdkl.ncs.android.component.nursehome.led;
 
 import android.app.Application;
 
-import com.wdkl.ncs.android.component.nursehome.common.Constants;
+import com.wdkl.ncs.android.middleware.common.Constants;
 
 import java.io.File;
 import java.util.ArrayList;

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/service/AppService.kt

@@ -10,8 +10,7 @@ import android.os.Binder
 import android.os.Build
 import android.os.IBinder
 import com.wdkl.ncs.android.component.nursehome.R
-import com.wdkl.ncs.android.component.nursehome.common.Constants
-import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
+import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import org.greenrobot.eventbus.EventBus
 import serialporttest.utils.SerialPortUtil

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/util/LedHelper.java

@@ -2,8 +2,8 @@ package com.wdkl.ncs.android.component.nursehome.util;
 
 import android.util.Log;
 
-import com.wdkl.ncs.android.component.nursehome.common.Constants;
 import com.wdkl.ncs.android.component.nursehome.led.LedManagerUtils;
+import com.wdkl.ncs.android.middleware.common.Constants;
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO;
 import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum;
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType;

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/util/SpeechUtil.java

@@ -6,8 +6,8 @@ import android.speech.tts.UtteranceProgressListener;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.wdkl.ncs.android.component.nursehome.common.Constants;
 
+import com.wdkl.ncs.android.middleware.common.Constants;
 
 import java.util.ArrayList;
 import java.util.Locale;

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/window/IncidentWindow.kt

@@ -14,13 +14,13 @@ import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.activity.NurseHomeActivity
-import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.AdapterEventListItemBinding
 import com.wdkl.ncs.android.component.nursehome.databinding.WindowIncidentBinding
 import com.wdkl.ncs.android.component.nursehome.settingconfig.SettingConfig
 import com.wdkl.ncs.android.component.nursehome.util.*
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
+import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
 import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil

android_host_manager/src/main/zk_h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/window/VisitingWindow.java

@@ -13,7 +13,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.wdkl.ncs.android.component.nursehome.R;
-import com.wdkl.ncs.android.component.nursehome.common.Constants;
+import com.wdkl.ncs.android.middleware.common.Constants;
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel;
 import com.wdkl.ncs.android.middleware.tcp.channel.VideoUtil;
 
@@ -88,7 +88,7 @@ public class VisitingWindow {
      * 删除窗口
      */
     public static void release() {
-        Constants.Companion.setCALL_STATE(Constants.Companion.getCALL_STANDBY());
+        Constants.Companion.setCALL_STATE(Constants.CALL_STANDBY);
         DeviceChannel.calling = false;
         if (view != null) {
             Chronometer time = view.findViewById(R.id.window_visiting_time);

build.gradle

@@ -50,7 +50,7 @@ buildscript {
      * ZJ-H10_W_KE-1H: 医院版卡尔10寸主机
      * ...
      */
-    ext.app_device_type = "zk_h10_w_ke_1"
+    ext.app_device_type = "zk_h10_z_3128_1"
 
     if (app_device_type == "zk_h10_w_ke_1") {
         //卡尔 10寸总控主机