Kaynağa Gözat

1。分机增加月子中心版本竖屏

xunchuanzhi 1 yıl önce
ebeveyn
işleme
813913fe62
100 değiştirilmiş dosya ile 11191 ekleme ve 346 silme
  1. 6 1
      android_bed/build.gradle
  2. 5 0
      android_bed/src/main/AndroidManifest.xml
  3. 53 11
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivationActivity.kt
  4. 0 2
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt
  5. 2264 0
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedMomActivity.kt
  6. 217 0
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/adapter/CallMomAdapter.kt
  7. 86 0
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/adapter/MomEventsMenuapter.kt
  8. 13 6
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/di/CallingbedComponent.kt
  9. 1 1
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/ServicesDialogHelper.java
  10. 1 1
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt
  11. 308 0
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MomCallFragment.kt
  12. 560 0
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MomMianFragment.kt
  13. 1 1
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/NurseFragment.kt
  14. 72 2
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/SipCallFragment.kt
  15. 26 3
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/SkyCallFragment.kt
  16. 31 10
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/VoiceMsgFragment.kt
  17. 1 1
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/YhFragment.kt
  18. 3 0
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/hardware/HardWareFactory.java
  19. 3 0
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/hardware/imp/A133HardTools.java
  20. 154 0
      android_bed/src/main/java/com/wdkl/app/ncs/callingbed/hardware/imp/ZKEHardTools.java
  21. 15 0
      android_bed/src/main/res/drawable/shape_baby_bg_title.xml
  22. 12 0
      android_bed/src/main/res/drawable/shape_baby_bg_title2.xml
  23. 15 0
      android_bed/src/main/res/drawable/shape_baby_bg_title3.xml
  24. 9 0
      android_bed/src/main/res/drawable/shape_mom_baby_name_bg.xml
  25. 9 0
      android_bed/src/main/res/drawable/shape_mom_sj_rv_bg.xml
  26. 599 0
      android_bed/src/main/res/layout-land/acivity_time_setting.xml
  27. 89 0
      android_bed/src/main/res/layout-land/activity_sign.xml
  28. 80 0
      android_bed/src/main/res/layout-land/adapter_call_records_item.xml
  29. 37 0
      android_bed/src/main/res/layout-land/adapter_shijian_records_item.xml
  30. 34 0
      android_bed/src/main/res/layout-land/call.xml
  31. 270 0
      android_bed/src/main/res/layout-land/callingbed_activation.xml
  32. 265 0
      android_bed/src/main/res/layout-land/callingbed_department_info_main.xml
  33. 166 0
      android_bed/src/main/res/layout-land/callingbed_doctor_info_main.xml
  34. 278 0
      android_bed/src/main/res/layout-land/callingbed_hospital_info_main.xml
  35. 218 0
      android_bed/src/main/res/layout-land/callingbed_main_mom.xml
  36. 509 0
      android_bed/src/main/res/layout-land/callingbed_main_new.xml
  37. 240 0
      android_bed/src/main/res/layout-land/callingbed_nurse.xml
  38. 250 0
      android_bed/src/main/res/layout-land/callingbed_nurse_main.xml
  39. 528 0
      android_bed/src/main/res/layout-land/callingbed_nurse_msg.xml
  40. 662 0
      android_bed/src/main/res/layout-land/callingbed_setting_main.xml
  41. 292 0
      android_bed/src/main/res/layout-land/callingbed_test_main.xml
  42. 162 0
      android_bed/src/main/res/layout-land/cost_view_lay.xml
  43. 142 0
      android_bed/src/main/res/layout-land/main_call_r_dialog.xml
  44. 28 0
      android_bed/src/main/res/layout-land/main_calling.xml
  45. 103 0
      android_bed/src/main/res/layout-land/sign_data_table_fragment_lay.xml
  46. 40 0
      android_bed/src/main/res/layout-land/sign_fragment_lay.xml
  47. 121 0
      android_bed/src/main/res/layout-land/sign_graph_curve_fragment_lay.xml
  48. 22 0
      android_bed/src/main/res/layout-land/sign_main_item_lay.xml
  49. 61 0
      android_bed/src/main/res/layout-land/sign_view_item_lay.xml
  50. 255 0
      android_bed/src/main/res/layout-land/sky_voice_call_layout.xml
  51. 45 0
      android_bed/src/main/res/layout-land/update_lay.xml
  52. 36 0
      android_bed/src/main/res/layout-land/voice_msg_lay.xml
  53. 72 0
      android_bed/src/main/res/layout-land/webciew_lay.xml
  54. 90 0
      android_bed/src/main/res/layout-land/yz_view_lay.xml
  55. 15 14
      android_bed/src/main/res/layout/adapter_call_records_item.xml
  56. 15 12
      android_bed/src/main/res/layout/adapter_shijian_records_item.xml
  57. 218 207
      android_bed/src/main/res/layout/callingbed_activation.xml
  58. 218 0
      android_bed/src/main/res/layout/callingbed_main_mom.xml
  59. 106 0
      android_bed/src/main/res/layout/mom_call_lay.xml
  60. 493 0
      android_bed/src/main/res/layout/mom_main_lay.xml
  61. 28 22
      android_bed/src/main/res/layout/sky_voice_call_layout.xml
  62. 1 1
      android_bed/src/main/res/layout/view_title_layout.xml
  63. 46 28
      android_bed/src/main/res/layout/voice_msg_lay.xml
  64. BIN
      android_bed/src/main/res/mipmap-mdpi/baby_bg.png
  65. BIN
      android_bed/src/main/res/mipmap-mdpi/huchu.png
  66. BIN
      android_bed/src/main/res/mipmap-mdpi/huru.png
  67. BIN
      android_bed/src/main/res/mipmap-mdpi/mom_call.png
  68. BIN
      android_bed/src/main/res/mipmap-mdpi/mom_ly.png
  69. BIN
      android_bed/src/main/res/mipmap-mdpi/mom_qt.png
  70. BIN
      android_bed/src/main/res/mipmap-mdpi/mom_sos.png
  71. BIN
      android_bed/src/main/res/mipmap-mdpi/shijianr.png
  72. BIN
      android_bed/src/main/res/mipmap-mdpi/sos.png
  73. BIN
      android_bed/src/main/res/mipmap-xhdpi/hs_img.png
  74. BIN
      android_bed/src/main/res/mipmap-xhdpi/huchu.png
  75. BIN
      android_bed/src/main/res/mipmap-xhdpi/huru.png
  76. BIN
      android_bed/src/main/res/mipmap-xhdpi/mom_hu.png
  77. BIN
      android_bed/src/main/res/mipmap-xhdpi/msg_gb.png
  78. BIN
      android_bed/src/main/res/mipmap-xhdpi/msg_return.png
  79. BIN
      android_bed/src/main/res/mipmap-xhdpi/shijianr.png
  80. BIN
      android_bed/src/main/res/mipmap-xhdpi/sos.png
  81. BIN
      android_bed/src/main/res/mipmap-xxhdpi/huchu.png
  82. BIN
      android_bed/src/main/res/mipmap-xxhdpi/huru.png
  83. BIN
      android_bed/src/main/res/mipmap-xxhdpi/shijianr.png
  84. BIN
      android_bed/src/main/res/mipmap-xxhdpi/sos.png
  85. 3 0
      android_bed/src/main/res/values/colors.xml
  86. 7 1
      app/build.gradle
  87. 5 5
      build.gradle
  88. 22 0
      callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/ExitHuliDialogHelper.java
  89. 17 13
      callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/YhFragment.kt
  90. 0 3
      janus/src/main/java/com/wdkl/ncs/janus/client/JanusClient.java
  91. 4 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/api/BedDeviceApi.kt
  92. 16 1
      middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java
  93. 7 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/di/PresenterComponent.kt
  94. 27 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/callingbed/BedMomCallFragmentContract.kt
  95. 50 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/callingbed/BedMomMianFragmentContract.kt
  96. 14 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/callingbed/VoiceFragmentContract.kt
  97. 14 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/callingbed/VoicePlayFragmentContract.kt
  98. 77 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/callingbed/BedMomCallFragmentPresenter.kt
  99. 229 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/callingbed/BedMomMianFragmentPresenter.kt
  100. 0 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/callingbed/VoiceFragmentPresenter.kt

+ 6 - 1
android_bed/build.gradle

@@ -31,6 +31,7 @@ android {
         buildConfigField "String", "BUILD_TIME", getDate()
         buildConfigField 'String', 'VERSION_NAME', "\"${project.rootProject.ext.app_version}\""
         buildConfigField 'String', 'VERSION_CODE', "\"${project.rootProject.ext.app_version_code}\""
+        buildConfigField 'String', 'is_mom', "\"${project.rootProject.ext.is_mom}\""
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -55,7 +56,11 @@ android {
             dimension "app"
             buildConfigField 'String', 'flag', '"5"'
         }
-
+        //卡尔-护士主机
+        kaer {
+            dimension "app"
+            buildConfigField 'String', 'flag', '"6"'
+        }
         //外购 a133s
         zhihe_A133 {
             dimension "app"

+ 5 - 0
android_bed/src/main/AndroidManifest.xml

@@ -128,6 +128,11 @@
             android:screenOrientation="nosensor"
             android:launchMode="singleTask"/>
 
+        <activity android:name="com.wdkl.app.ncs.callingbed.activity.CallingbedMomActivity"
+            android:turnScreenOn="true"
+            android:screenOrientation="nosensor"
+            android:launchMode="singleTask"/>
+
 
         <service android:name="com.wdkl.app.ncs.callingbed.bt_gateway.BluetoothService"/>
 

+ 53 - 11
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivationActivity.kt

@@ -15,6 +15,7 @@ import com.enation.javashop.net.engine.config.NetEngineConfig
 import com.enation.javashop.net.engine.model.NetState
 import com.enation.javashop.net.engine.plugin.exception.RestfulExceptionInterceptor
 import com.enation.javashop.utils.base.config.BaseConfig
+import com.google.gson.Gson
 import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.databinding.CallingbedActivationBinding
@@ -150,7 +151,6 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
 
     override fun onResume() {
         super.onResume()
-
         showUI()
     }
 
@@ -159,6 +159,12 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
     }
 
     private fun showUI(){
+        if (BuildConfig.is_mom.toBoolean()){
+            activation_img.setBackgroundResource(R.mipmap.activation_p_mom_bg)
+            activation_settings_button.setBackgroundResource(R.drawable.shape_main_bt_mom_bg)
+            activation_system_button.setBackgroundResource(R.drawable.shape_main_bt_mom_bg)
+            activation_services_button.setBackgroundResource(R.drawable.shape_main_bt_mom_bg)
+        }
         val isActivation = SPUtils.get(this, Constant.APP_ACTIVATION, "");
         if (isActivation.equals("已激活")){
             activation_title.setText("系统连接失败")
@@ -174,13 +180,15 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
         //注册方式
         HardWareFactory.getHardTools().Registration(this)
 
-        val netInfo = NetHelper.getNetInfo(activity)
-        activation_v.text =  BuildConfig.VERSION_NAME + "_" + BuildConfig.VERSION_CODE + "_" + Build.MODEL
-        activation_ip.text = NetHelper.getInstance().localIP
-        if (netInfo != null) {
-            activation_wg.text = netInfo.gateway
-            activation_ym.text = netInfo.netMask
-        }
+
+            val netInfo = NetHelper.getNetInfo(activity)
+            activation_v.text =  BuildConfig.VERSION_NAME + "_" + BuildConfig.VERSION_CODE + "_" + Build.MODEL
+            activation_ip.text = NetHelper.getInstance().localIP
+            if (netInfo != null) {
+                activation_wg.text = netInfo.gateway
+                activation_ym.text = netInfo.netMask
+            }
+
         activation_zcm.text=  Constant.DEVICE_REGISTER_ID
         val buildUrl = UrlManager.build()
         activation_fuq.text=   buildUrl.buyer.substringAfterLast("//").substringBefore(":")
@@ -315,9 +323,43 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
     override fun showDeviceInfo(deviceInfo: BedDeviceInfoVO) {
         //获取到设备信息,跳转到主界面
         serverSuccess = true
-        val intent = Intent()
-        intent.setClass(activity, CallingbedActivity::class.java)
-        activity.startActivity(intent)
+        Constant.SIP_ID = deviceInfo.sipId
+        Constant.DEVICE_ID = deviceInfo.id
+        Constant.PART_ID = deviceInfo.partId
+        Constant.BED_NAME = deviceInfo.fullName
+
+        Constant.DEVICE_CODE = deviceInfo.code
+        Constant.DEVICE_MODEL = deviceInfo.model
+        Constant.DEVICE_SOFT_VER = deviceInfo.softVer
+        Constant.DEVICE_HARD_VER = deviceInfo.hardVer
+        Constant.DEVICE_INFO = Gson().toJson(deviceInfo)
+
+        if (deviceInfo.partName != null) {
+            Constant.PART_NAME = deviceInfo.partName
+        }
+        if (deviceInfo.part_union_id != null) {
+            Constant.PART_UNION_ID = deviceInfo.part_union_id
+        }
+        if (deviceInfo.customerId != null) {
+            Constant.CUSTOM_ID = deviceInfo.customerId
+        }
+
+        if (deviceInfo.memberId != null) {
+            Constant.MEMBER_ID = deviceInfo.memberId
+        }
+
+        if (deviceInfo.status != null) {
+            Constant.DEVICE_STATUS = deviceInfo.status
+        }
+        if (BuildConfig.is_mom.toBoolean()){
+            val intent = Intent()
+            intent.setClass(activity, CallingbedMomActivity::class.java)
+            activity.startActivity(intent)
+        }else{
+            val intent = Intent()
+            intent.setClass(activity, CallingbedActivity::class.java)
+            activity.startActivity(intent)
+        }
         finish()
     }
 

+ 0 - 2
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -44,8 +44,6 @@ import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
 import com.wdkl.app.ncs.callingbed.service.WdklSipService
 import com.wdkl.app.ncs.callingbed.settings.SettingConfig
 import com.wdkl.app.ncs.callingbed.utils.NfcUtils
-import com.wdkl.app.ncs.callingdoor.fragment.NurseFragment
-import com.wdkl.app.ncs.callingdoor.fragment.YhFragment
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.*

Dosya farkı çok büyük olduğundan ihmal edildi
+ 2264 - 0
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedMomActivity.kt


+ 217 - 0
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/adapter/CallMomAdapter.kt

@@ -0,0 +1,217 @@
+package com.wdkl.app.ncs.callingbed.adapter
+
+import android.app.Activity
+import android.content.Context
+import android.graphics.Color
+import android.util.TypedValue
+import android.view.View
+import android.view.ViewGroup
+import com.alibaba.android.vlayout.LayoutHelper
+import com.alibaba.android.vlayout.layout.LinearLayoutHelper
+import com.alibaba.fastjson.JSONObject
+import com.wdkl.app.ncs.callingbed.R
+import com.wdkl.app.ncs.callingbed.databinding.AdapterCallRecordsItemBinding
+import com.wdkl.app.ncs.callingbed.dialog.ReinforcementsDialogHelper
+import com.wdkl.app.ncs.callingbed.fragment.CallRecordsFragment
+import com.wdkl.app.ncs.callingbed.helper.SoundPoolManager
+import com.wdkl.app.ncs.callingbed.helper.SpeechUtil
+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.model.vo.InteractionVO
+import com.wdkl.ncs.android.middleware.tcp.TcpClient
+import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil
+import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
+import com.wdkl.ncs.android.middleware.tcp.dto.TcpCallback
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
+import com.wdkl.ncs.android.middleware.utils.RingPlayHelper
+
+
+/**
+ * 呼叫记录适配器
+ */
+class CallMomAdapter(var data: ArrayList<InteractionVO>) : BaseDelegateAdapter<BaseRecyclerViewHolder<AdapterCallRecordsItemBinding>, InteractionVO>() {
+    var TAG = CallMomAdapter::class.java.getSimpleName()
+    private lateinit var onItemClickListener:OnItemClickListener
+     var context: Context? = null
+    var  type  = 0
+    /**
+     * 数据提供者
+     */
+    override fun dataProvider(): Any {
+        return data
+    }
+
+    /**
+     * Item坐标
+     */
+    override fun itemFilter(position: Int): Boolean {
+        return true
+    }
+
+    /**
+     * 获取Item总数
+     */
+    override fun getItemCount(): Int {
+        return data.size
+    }
+
+    //刷新数据
+    fun updateCallRecords(data: ArrayList<InteractionVO>) {
+        this.data = data
+        notifyDataSetChanged()
+    }
+
+    interface OnItemClickListener {
+        fun oncallItemClick(view: View, keyId: Int, actionType : String ,toDeviceId: Int, actionAccept:Int)
+    }
+
+    fun setOnItemClickListener(listener: OnItemClickListener) {
+        this.onItemClickListener = listener
+    }
+    /**
+     * 创建LayoutHelper
+     */
+    override fun onCreateLayoutHelper(): LayoutHelper {
+        return LinearLayoutHelper(0, data.size)
+    }
+
+    /**
+     * 创建ViewHolder
+     */
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseRecyclerViewHolder<AdapterCallRecordsItemBinding> {
+        return BaseRecyclerViewHolder.build(parent, R.layout.adapter_call_records_item)
+    }
+
+    /**
+     * 绑定数据
+     */
+    override fun onBindViewHolder(holder: BaseRecyclerViewHolder<AdapterCallRecordsItemBinding>, position: Int) {
+        holder.bind { binding ->
+            val itemData = getItem(position)
+            //未接
+
+            //交互类型(1:语音通话,2:视频通话,3:卫生间紧急呼叫,4:语音留言,5:文本消息,6:按键事件)
+             if (TcpType.VOICE.name == itemData.actionType || TcpType.VIDEO.name == itemData.actionType){
+                 //呼出
+                 if (itemData.fromDeviceId == Constant.DEVICE_ID){
+                     binding.tabImagev.setImageResource(R.mipmap.huchu)
+                     binding.callRecordsItemTitle.text = "呼出-"+itemData.toDeviceName
+                     if (itemData.actionEnd != null && itemData.actionAccept != null) {
+                         binding.callRecordsItemType.text = "已接通"
+                         binding.callRecordsItemType.setTextColor(Color.parseColor("#2EA22A"));
+                         binding.callRecordsItemCall.visibility = View.VISIBLE
+                         binding.callRecordsItemCall.setTextColor(Color.parseColor("#2EA22A"));
+                         binding.callRecordsItemCall.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12f)
+                         binding.callRecordsItemCall.background= null
+                         binding.callRecordsItemCall.text = TimeHandle.getDateTime(itemData.actionEnd * 1000, "HH:mm")
+                     }else{
+                         binding.callRecordsItemType.text = "未接听"
+                         binding.callRecordsItemType.setTextColor(Color.parseColor("#E82222"));
+                         binding.callRecordsItemCall.visibility = View.VISIBLE
+                         binding.callRecordsItemCall.text = ""
+                         binding.callRecordsItemCall.background= null
+                         binding.callRecordsItemCall.setTextColor(Color.parseColor("#FFFFFF"));
+                         binding.callRecordsItemCall.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9f)
+                         //binding.callRecordsItemCall.setBackgroundResource(R.drawable.shape_main_call_r_wj_bg)
+                     }
+                 }else{
+                     //呼入
+                     binding.tabImagev.setImageResource(R.mipmap.huru)
+                     binding.callRecordsItemTitle.text = "呼入-"+itemData.toDeviceName
+                     if (itemData.actionEnd != null && itemData.actionAccept != null) {
+                         binding.callRecordsItemType.text = "已接通"
+                         binding.callRecordsItemType.setTextColor(Color.parseColor("#2EA22A"));
+                         binding.callRecordsItemCall.visibility = View.VISIBLE
+                         binding.callRecordsItemCall.setTextColor(Color.parseColor("#2EA22A"));
+                         binding.callRecordsItemCall.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12f)
+                         binding.callRecordsItemCall.background= null
+                         binding.callRecordsItemCall.text = TimeHandle.getDateTime(itemData.actionEnd * 1000, "HH:mm")
+                     }else{
+                         binding.callRecordsItemType.text = "未接听"
+                         binding.callRecordsItemType.setTextColor(Color.parseColor("#E82222"));
+                         binding.callRecordsItemCall.visibility = View.VISIBLE
+                         binding.callRecordsItemCall.text = ""
+                         binding.callRecordsItemCall.background= null
+                         binding.callRecordsItemCall.setTextColor(Color.parseColor("#FFFFFF"));
+                         binding.callRecordsItemCall.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9f)
+                         //binding.callRecordsItemCall.setBackgroundResource(R.drawable.shape_main_call_r_wj_bg)
+                     }
+                 }
+
+             }else if (TcpType.SOS.name == itemData.actionType){
+                 binding.tabImagev.setImageResource(R.mipmap.sos)
+                 binding.callRecordsItemTitle.text = "SOS呼叫"
+                 if (itemData.actionEnd != null) {
+                     binding.callRecordsItemType.text = "已响应"
+                     binding.callRecordsItemType.setTextColor(Color.parseColor("#2EA22A"));
+                     binding.callRecordsItemCall.visibility = View.GONE
+                 }else{
+                     binding.callRecordsItemType.text = "未响应"
+                     binding.callRecordsItemType.setTextColor(Color.parseColor("#E82222"));
+                     binding.callRecordsItemCall.visibility = View.VISIBLE
+                     binding.callRecordsItemCall.text = ""
+                     binding.callRecordsItemCall.background= null
+                     binding.callRecordsItemCall.setTextColor(Color.parseColor("#FFFFFF"));
+                     binding.callRecordsItemCall.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9f)
+                     //binding.callRecordsItemCall.setBackgroundResource(R.drawable.shape_main_call_r_wj_bg)
+                 }
+             }else if (TcpType.REINFORCE.name == itemData.actionType){
+                 binding.tabImagev.setImageResource(R.mipmap.sos)
+                 binding.callRecordsItemTitle.text = "增援请求"
+                 if (itemData.actionEnd != null) {
+                     binding.callRecordsItemType.text = "已响应"
+                     binding.callRecordsItemType.setTextColor(Color.parseColor("#2EA22A"));
+                     binding.callRecordsItemCall.visibility = View.GONE
+                 }else{
+                     binding.callRecordsItemType.text = "未响应"
+                     binding.callRecordsItemType.setTextColor(Color.parseColor("#E82222"));
+                     binding.callRecordsItemCall.visibility = View.VISIBLE
+                     binding.callRecordsItemCall.text = ""
+                     binding.callRecordsItemCall.background= null
+                     binding.callRecordsItemCall.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9f)
+                     binding.callRecordsItemCall.setTextColor(Color.parseColor("#FFFFFF"));
+                     //binding.callRecordsItemCall.setBackgroundResource(R.drawable.shape_main_call_r_wj_bg)
+                 }
+             }else if (TcpType.EVENT.name == itemData.actionType){
+                 binding.tabImagev.setImageResource(R.mipmap.shijianr)
+                 binding.callRecordsItemTitle.text = itemData.data+"-事件呼叫"
+                 if (itemData.actionEnd != null) {
+                     binding.callRecordsItemType.text = "已响应"
+                     binding.callRecordsItemType.setTextColor(Color.parseColor("#2EA22A"));
+                     binding.callRecordsItemCall.visibility = View.VISIBLE
+                     binding.callRecordsItemCall.text = "确认完成"
+                     binding.callRecordsItemCall.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9f)
+                     binding.callRecordsItemCall.setTextColor(Color.parseColor("#FFFFFF"));
+                     binding.callRecordsItemCall.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
+                 }else{
+                     binding.callRecordsItemType.text = "未响应"
+                     binding.callRecordsItemType.setTextColor(Color.parseColor("#E82222"));
+                     binding.callRecordsItemCall.visibility = View.VISIBLE
+                     binding.callRecordsItemCall.text = ""
+                     binding.callRecordsItemCall.background= null
+                     binding.callRecordsItemCall.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9f)
+                     binding.callRecordsItemCall.setTextColor(Color.parseColor("#FFFFFF"));
+                     //binding.callRecordsItemCall.setBackgroundResource(R.drawable.shape_main_call_r_wj_bg)
+                 }
+             }
+            if (itemData.createDate != null) {
+                binding.callRecordsItemTime.text = TimeHandle.getDateTime(itemData.createDate * 1000, "MM-dd HH:mm")
+            }
+
+            /*binding.callRecordsItemCall.setOnClickListener {
+
+                if (itemData.actionAccept!=null){
+                    type=0
+                }
+                onItemClickListener?.oncallItemClick(holder.itemView, position,itemData.actionType ,itemData.toDeviceId ,type)
+            }*/
+
+
+
+        }
+    }
+
+}

+ 86 - 0
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/adapter/MomEventsMenuapter.kt

@@ -0,0 +1,86 @@
+package com.wdkl.app.ncs.callingbed.adapter
+
+import android.content.Context
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.wdkl.app.ncs.callingbed.R
+import com.wdkl.ncs.android.middleware.api.UrlManager
+import com.wdkl.ncs.android.middleware.model.ActionItem
+import com.wdkl.ncs.android.middleware.model.dos.EventDO
+import com.wdkl.ncs.android.middleware.model.vo.DeviceMenulist
+
+class MomEventsMenuapter : RecyclerView.Adapter<MomEventsMenuapter.ViewHolder>{
+
+    private var context: Context
+    private var data: ArrayList<EventDO>
+    private lateinit var onItemClickListener: OnItemClickListener
+
+    private val urlManager = UrlManager.build()
+
+    constructor(context: Context, data: ArrayList<EventDO>): super() {
+        this.context = context
+        this.data = data
+    }
+
+    fun setOnItemClickListener(listener: OnItemClickListener) {
+        this.onItemClickListener = listener
+    }
+
+    fun updateData(data: ArrayList<EventDO>) {
+        this.data = data
+        notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = LayoutInflater.from(parent?.context).inflate(R.layout.adapter_shijian_records_item, parent, false)
+        val viewHolder = ViewHolder(view)
+
+        return viewHolder
+    }
+
+    override fun getItemCount(): Int {
+        return data?.size
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        if ( data?.get(position).name!=null){
+            holder.textView.text = data?.get(position).name
+        }
+        if (data?.get(position).iconSrc!=null && !data?.get(position).iconSrc.equals("")){
+            Glide.with(holder.imageView.context)
+                    .load( data?.get(position).iconSrc)
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .into(holder.imageView)
+        }else{
+            holder.imageView.visibility=View.GONE
+        }
+        holder.actionView.setOnClickListener {
+            onItemClickListener?.onItemClick(holder.itemView, position)
+//            onItemClickListener?.onItemClick(holder.itemView, data?.get(position).id)
+        }
+    }
+
+
+    class ViewHolder: RecyclerView.ViewHolder {
+        var actionView : View
+        var textView : TextView
+        var imageView : ImageView
+
+        constructor(itemView: View): super(itemView) {
+            actionView = itemView.findViewById(R.id.sj_view)
+            textView = itemView.findViewById(R.id.sj_records_item_title)
+            imageView = itemView.findViewById(R.id.sj_img)
+        }
+    }
+
+    interface OnItemClickListener {
+        fun onItemClick(view: View, keyId: Int)
+    }
+}

+ 13 - 6
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/di/CallingbedComponent.kt

@@ -2,8 +2,7 @@ package com.wdkl.app.ncs.callingbed.di
 
 import com.wdkl.app.ncs.callingbed.activity.*
 import com.wdkl.app.ncs.callingbed.fragment.*
-import com.wdkl.app.ncs.callingdoor.fragment.NurseFragment
-import com.wdkl.app.ncs.callingdoor.fragment.YhFragment
+
 import com.wdkl.ncs.android.middleware.di.ApplicationComponent
 import dagger.Component
 
@@ -27,13 +26,16 @@ interface CallingbedComponent {
 
     fun inject(activity: CountdownActivity)
 
-    fun inject(fragment: CostActivity)
+    fun inject(activity: CostActivity)
+
+    fun inject(activity: SignActivity)
+
+    fun inject(activity: DoctorsAdviceActivity)
 
-    fun inject(fragment: SignActivity)
+    fun inject(activity: SetHintActivity)
 
-    fun inject(fragment: DoctorsAdviceActivity)
+    fun inject(activity: CallingbedMomActivity)
 
-    fun inject(fragment: SetHintActivity)
 
     fun inject(fragment: MainFragment)
 
@@ -60,6 +62,11 @@ interface CallingbedComponent {
 
     fun inject(fragment: SignDataTableFragment)
 
+    fun inject(fragment: MomMianFragment)
+
+    fun inject(fragment: MomCallFragment)
+
+
 
 
 }

+ 1 - 1
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/ServicesDialogHelper.java

@@ -22,7 +22,7 @@ public class ServicesDialogHelper {
     public static void showDialog(final Activity activity, ClickListener clickListener) {
 
         View contentView = LayoutInflater.from(activity).inflate(R.layout.main_server_dialog, null);
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.Theme_AppCompat_Dialog);
         builder.setView(contentView);
 
         Button server_determine_button = contentView.findViewById(R.id.server_determine_button);

+ 1 - 1
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -99,7 +99,7 @@ class  MainFragment: BaseFragment<BedMainFragmentPresenter, MainViewLayoutBindin
         }
 
         //隐藏空页面并展示入住信息
-        Constant.CUSTOM_INFO = Gson().toJson(customInfo)
+//        Constant.CUSTOM_INFO = Gson().toJson(customInfo)
         //显示入住信息
         tv_bed_name.text = customInfo.named
 

+ 308 - 0
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MomCallFragment.kt

@@ -0,0 +1,308 @@
+package com.wdkl.app.ncs.callingbed.fragment
+
+
+import android.graphics.Typeface
+import android.icu.lang.UCharacter.GraphemeClusterBreak.T
+import android.util.Log
+import android.util.TypedValue
+import android.view.View
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.alibaba.android.vlayout.DelegateAdapter
+import com.alibaba.android.vlayout.VirtualLayoutManager
+import com.alibaba.fastjson.JSONObject
+import com.enation.javashop.net.engine.model.NetState
+import com.scwang.smartrefresh.layout.footer.ClassicsFooter
+import com.wdkl.app.ncs.callingbed.R
+import com.wdkl.app.ncs.callingbed.activity.CallingbedActivity
+import com.wdkl.app.ncs.callingbed.adapter.CallMomAdapter
+import com.wdkl.app.ncs.callingbed.adapter.CallRecordsItemAdapter
+import com.wdkl.app.ncs.callingbed.adapter.SignMianAdapter
+import com.wdkl.app.ncs.callingbed.adapter.YhMianAdapter
+import com.wdkl.app.ncs.callingbed.databinding.CallingbedNurseBinding
+import com.wdkl.app.ncs.callingbed.databinding.MomCallLayBinding
+import com.wdkl.app.ncs.callingbed.dialog.ReinforcementsDialogHelper
+import com.wdkl.app.ncs.callingbed.helper.SoundPoolManager
+import com.wdkl.app.ncs.callingbed.helper.SpeechUtil
+import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
+import com.wdkl.app.ncs.callingbed.utils.SPUtils
+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.Constant
+import com.wdkl.ncs.android.middleware.logic.contract.callingbed.BedMomCallFragmentContract
+import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.YhFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.callingbed.BedMomCallFragmentPresenter
+import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.YhFragmentPresenter
+import com.wdkl.ncs.android.middleware.model.vo.CallRecordVO
+import com.wdkl.ncs.android.middleware.model.vo.ClerkByVO
+import com.wdkl.ncs.android.middleware.model.vo.DeviceMenulist
+import com.wdkl.ncs.android.middleware.tcp.TcpClient
+import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil
+import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
+import com.wdkl.ncs.android.middleware.tcp.channel.YhUtil
+import com.wdkl.ncs.android.middleware.tcp.dto.TcpCallback
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
+import com.wdkl.ncs.android.middleware.utils.RingPlayHelper
+import kotlinx.android.synthetic.main.activity_sign.*
+import kotlinx.android.synthetic.main.callingbed_nurse.*
+import kotlinx.android.synthetic.main.main_call_r_dialog.*
+import kotlinx.android.synthetic.main.main_call_r_dialog.main_call_r_l_rv_1
+import kotlinx.android.synthetic.main.mom_call_lay.*
+
+
+/**
+ * 月子中心呼叫记录界面
+ */
+
+class  MomCallFragment : BaseFragment<BedMomCallFragmentPresenter, MomCallLayBinding>(), BedMomCallFragmentContract.View  , CallMomAdapter.OnItemClickListener{
+
+    val TAG = "MomCallFragment"
+
+    private val adapter = CallMomAdapter(ArrayList())
+
+    private lateinit var virtualLayoutManager: VirtualLayoutManager
+
+    private lateinit var delegateAdapter: DelegateAdapter
+
+    //加载历史记录条数
+    private val pageSize: Int = 15
+    //数据的初始页数
+    private var page: Int = 1
+    //查询历史记录类型
+    private var listType: Int = 0
+
+
+
+    override fun getLayId(): Int {
+        return R.layout.mom_call_lay
+    }
+
+    override fun bindDagger() {
+        CallingbedLaunch.component.inject(this)
+    }
+
+    //数据绑定
+    override fun init() {
+        /**初始化LayoutMannager*/
+        virtualLayoutManager = VirtualLayoutManager(this.activity)
+        /**初始化适配器*/
+        delegateAdapter = DelegateAdapter(virtualLayoutManager)
+        delegateAdapter.addAdapter(adapter)
+        mViewDataBinding.momRefresh.setRefreshFooter(ClassicsFooter(activity))
+
+        /**配置到RecycleView*/
+        mom_call_r_l_rv_2.layoutManager = virtualLayoutManager
+        mom_call_r_l_rv_2.adapter = delegateAdapter
+
+    }
+    override fun onResume() {
+        super.onResume()
+
+        if (Constant.CUSTOM_ID != -1) {
+            presenter.loadCallRecords(page, pageSize, Constant.CUSTOM_ID)
+        }
+
+    }
+    //点击事件
+    override fun bindEvent() {
+
+        //未接来电
+        mom_no_answer_calls_linlyout.setOnClickListener {
+            if (listType != 1) {
+                mom_call_records_imagev.visibility = View.GONE
+                mom_no_answer_calls_imagev.visibility = View.VISIBLE
+
+
+
+                mom_no_answer_calls_tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 42f)
+                mom_no_answer_calls_tv.setTypeface(null, Typeface.BOLD)
+                mom_no_answer_calls_tv.setTextColor(getResources().getColor(R.color.black))
+
+                mom_call_records_tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 33f)
+                mom_call_records_tv.setTypeface(null, Typeface.NORMAL)
+                mom_call_records_tv.setTextColor(getResources().getColor(R.color.sign_main_text))
+                page = 1
+                listType = 1
+                presenter.loadCallRecords(page, pageSize, Constant.CUSTOM_ID)
+            }
+        }
+        mom_call_records_linlyout.setOnClickListener {
+            if (listType != 0) {
+                mom_call_records_imagev.visibility = View.VISIBLE
+                mom_no_answer_calls_imagev.visibility = View.GONE
+
+                mom_call_records_tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 42f)
+                mom_call_records_tv.setTypeface(null, Typeface.BOLD)
+                mom_call_records_tv.setTextColor(getResources().getColor(R.color.black))
+
+                mom_no_answer_calls_tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 33f)
+                mom_no_answer_calls_tv.setTypeface(null, Typeface.NORMAL);
+                mom_no_answer_calls_tv.setTextColor(getResources().getColor(R.color.sign_main_text))
+
+                page = 1
+                listType = 0
+                presenter.loadCallRecords(page, pageSize, Constant.CUSTOM_ID)
+            }
+        }
+        configRefresh()
+    }
+
+    /**执行其他销毁操作*/
+    override fun destory() {
+
+    }
+
+    private fun configRefresh(){
+        //下拉刷新
+        mViewDataBinding.momRefresh.setOnRefreshListener {
+            page = 1
+            presenter.loadCallRecords(page, pageSize, Constant.CUSTOM_ID)
+        }
+        //上拉加载更多
+        mViewDataBinding.momRefresh.setOnLoadMoreListener {
+            page += 1
+            presenter.loadCallRecords(page, pageSize, Constant.CUSTOM_ID)
+        }
+    }
+
+    override fun showCallRecords(record: CallRecordVO) {
+        Log.e(TAG,"CallRecordsFragment走了。。。"+record.data.size)
+        mom_refresh.resetNoMoreData()
+        if (page == 1) {
+            mom_refresh.resetNoMoreData()
+            if (record.data.size > 0) {
+                adapter.data.clear()
+                for (item in record.data) {
+                    if (TcpType.VIDEO.name == item.actionType || TcpType.VOICE.name == item.actionType) {
+                        if (listType==1) {
+                            if ( item.actionAccept == null ){
+                                adapter.data.add(item)
+                            }
+                        }else{
+                            adapter.data.add(item)
+                        }
+                    }
+                    if (TcpType.SOS.name == item.actionType || TcpType.REINFORCE.name == item.actionType|| TcpType.EVENT.name == item.actionType) {
+                        if (listType==1) {
+                            if ( item.actionStatus == null ){
+                                adapter.data.add(item)
+                            }
+                        }else{
+                            adapter.data.add(item)
+                        }
+                    }
+                }
+                Log.i("abc1"," " + adapter.data.size)
+                adapter.setOnItemClickListener(this)
+                adapter.notifyDataSetChanged()
+            }
+            mom_refresh.finishRefresh()
+        } else {
+            if (record.data.size > 0) {
+                for (item in record.data) {
+                    if (TcpType.VIDEO.name == item.actionType || TcpType.VOICE.name == item.actionType) {
+                        if (listType==1) {
+                            if ( item.actionAccept == null ){
+                                adapter.data.add(item)
+                            }
+                        }else{
+                            adapter.data.add(item)
+                        }
+                    }
+                    if (TcpType.SOS.name == item.actionType || TcpType.REINFORCE.name == item.actionType|| TcpType.EVENT.name == item.actionType) {
+                        if (listType==1) {
+                            if ( item.actionStatus == null ){
+                                adapter.data.add(item)
+                            }
+                        }else{
+                            adapter.data.add(item)
+                        }
+                    }
+                }
+                adapter.setOnItemClickListener(this)
+                adapter.notifyDataSetChanged()
+                mom_refresh.finishLoadMore()
+            } else {
+                mom_refresh.finishLoadMoreWithNoMoreData()
+            }
+        }
+    }
+
+    override fun onError(message: String, type: Int) {
+        showMessage(message)
+    }
+
+    override fun complete(message: String, type: Int) {
+
+    }
+
+    override fun start() {
+
+    }
+
+
+    override fun networkMonitor(state: NetState) {
+        state.filter(onWifi = {
+
+        }, onMobile = {
+
+        }, offline = {
+
+        })
+    }
+
+
+    override fun oncallItemClick(view: View, keyId: Int, actionType: String, toDeviceId: Int, actionAccept: Int) {
+        if (TcpType.VOICE.name == actionType || TcpType.VIDEO.name == actionType){
+            if (actionAccept == 0){
+                if (Constant.DEVICE_ID != -1) {
+                    //呼出时停止语音播报及铃声
+                    SpeechUtil.getInstance().stopSpeak()
+                    RingPlayHelper.stopRingTone()
+                    Log.d(TAG, "reply: to deviceId=" + toDeviceId + ", " + Constant.DEVICE_ID)
+                    if (toDeviceId != Constant.DEVICE_ID) {
+                        if (Constant.TCP_CONNECTED) {
+                            val callTcp = VoiceUtil.voiceCall(Constant.DEVICE_ID, toDeviceId)
+                            val transaction = object : TcpCallback(callTcp.tid) {
+                                override fun onSuccess(jsonObject: JSONObject) {
+                                    super.onSuccess(jsonObject)
+                                }
+                                override fun onFailed(jsonObject: JSONObject) {
+                                    // 这里写发送失败的方法
+                                    val callbackString = jsonObject.getString(CALLBACK)
+                                    showMessage("call fail: $callbackString")
+                                    super.onFailed(jsonObject)
+                                }
+                            }
+                            TcpClient.getInstance().sendTcp(callTcp, false, transaction)
+                        } else {
+                            showMessage(R.string.net_error)
+                        }
+                    }
+                } else {
+                    showMessage("没有设备id")
+                }
+            }
+
+        }else if (TcpType.REINFORCE.name == actionType){
+            if (Constant.DEVICE_ID != -1 && Constant.TCP_CONNECTED) {
+                OtherUtil.sendReinforce(Constant.DEVICE_ID)
+                ReinforcementsDialogHelper.showDialog(activity , true)
+//                        WidgetsUtil.showToastWithImage(getString(R.string.support_sent), 200f)
+                SoundPoolManager.getInstance().playSound(4, 1.0f, 1.0f, 0)
+            } else {
+                showMessage("没有设备id")
+            }
+
+        }else if (TcpType.SOS.name == actionType){
+            /*if (Constant.TCP_CONNECTED) {
+                SOSHelper.sosStart()
+            }*/
+        }else if (TcpType.EVENT.name == actionType){
+
+        }
+    }
+
+
+}

+ 560 - 0
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MomMianFragment.kt

@@ -0,0 +1,560 @@
+package com.wdkl.app.ncs.callingbed.fragment
+
+
+import android.os.Bundle
+import android.text.TextUtils
+import android.util.Log
+import android.view.Display
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.alibaba.android.vlayout.DelegateAdapter
+import com.alibaba.android.vlayout.VirtualLayoutManager
+import com.alibaba.fastjson.JSONObject
+import com.enation.javashop.net.engine.model.NetState
+import com.wdkl.app.ncs.callingbed.R
+import com.wdkl.app.ncs.callingbed.activity.CallingbedActivity
+import com.wdkl.app.ncs.callingbed.activity.CallingbedMomActivity
+import com.wdkl.app.ncs.callingbed.adapter.EventsMenuapter
+import com.wdkl.app.ncs.callingbed.adapter.MomEventsMenuapter
+import com.wdkl.app.ncs.callingbed.adapter.SignMianAdapter
+import com.wdkl.app.ncs.callingbed.adapter.YhMianAdapter
+import com.wdkl.app.ncs.callingbed.databinding.CallingbedNurseBinding
+import com.wdkl.app.ncs.callingbed.databinding.MomMainLayBinding
+import com.wdkl.app.ncs.callingbed.dialog.CallTypeDialogHelper
+import com.wdkl.app.ncs.callingbed.dialog.LoadingDialogHelper
+import com.wdkl.app.ncs.callingbed.helper.SpeechUtil
+import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
+import com.wdkl.app.ncs.callingbed.utils.SPUtils
+import com.wdkl.ncs.android.lib.base.BaseFragment
+import com.wdkl.ncs.android.lib.utils.AppTool
+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.callingbed.BedMomMianFragmentContract
+import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.YhFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.callingbed.BedMomMianFragmentPresenter
+import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.YhFragmentPresenter
+import com.wdkl.ncs.android.middleware.model.dos.EventDO
+import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
+import com.wdkl.ncs.android.middleware.model.dos.RoleDO
+import com.wdkl.ncs.android.middleware.model.vo.*
+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.OtherUtil
+import com.wdkl.ncs.android.middleware.tcp.channel.YhUtil
+import com.wdkl.ncs.android.middleware.tcp.dto.TcpCallback
+import com.wdkl.ncs.android.middleware.tcp.enums.CommunicationEnum
+import com.wdkl.ncs.android.middleware.utils.CommonUtils
+import kotlinx.android.synthetic.main.activity_sign.*
+import kotlinx.android.synthetic.main.callingbed_nurse.*
+import kotlinx.android.synthetic.main.callingbed_nurse.nurse_bt
+import kotlinx.android.synthetic.main.main_call_r_dialog.*
+import kotlinx.android.synthetic.main.main_view_layout.*
+import kotlinx.android.synthetic.main.mom_main_lay.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+
+/**
+ * 月子中心主界面界面
+ */
+
+class  MomMianFragment : BaseFragment<BedMomMianFragmentPresenter, MomMainLayBinding>(), BedMomMianFragmentContract.View , MomEventsMenuapter.OnItemClickListener {
+
+    val TAG = "MomMianFragment"
+
+    private lateinit var deviceMenuapter : MomEventsMenuapter
+
+    private var allOrders = ArrayList<EventDO>()
+    private var infoFragment: Fragment? = null
+
+    override fun getLayId(): Int {
+        return R.layout.mom_main_lay
+    }
+
+    override fun bindDagger() {
+        CallingbedLaunch.component.inject(this)
+    }
+
+    //数据绑定
+    override fun init() {
+        val layoutManager = GridLayoutManager(getActivity(), 3)
+        mom_baby_sj.setLayoutManager(layoutManager)
+
+        if (Constant.CUSTOM_ID != null) {
+            presenter.loadCustomInfo(Constant.CUSTOM_ID)
+        }
+        //事件
+        if (Constant.PART_ID != null) {
+            presenter.loadEventList(Constant.PART_ID)
+
+        }
+        presenter.getRoleList()
+
+
+    }
+    private var clickTime : Long = 0
+    //点击事件
+    override fun bindEvent() {
+        //呼叫护士
+        mom_call_nurse_img.setOnClickListener {
+            callNetWork()
+        }
+        //呼叫其他
+        mom_call_qt_img.setOnClickListener {
+            if (Constant.PART_ID != null) {
+                presenter.loadPartSettings(Constant.PART_ID)
+            }
+            mom_baby_sj.visibility = View.GONE
+            mom_frame_new.visibility = View.GONE
+            mom_bt_ll.visibility = View.VISIBLE
+
+        }
+        //语音留言
+        mom_voice_message_img.setOnClickListener {
+            mom_frame_new.visibility = View.VISIBLE
+            mom_baby_sj.visibility = View.GONE
+            mom_bt_ll.visibility = View.GONE
+            if ( !TextUtils.isEmpty(Constant.SIP_ID)) {
+                val fragment = VoiceMsgFragment()
+                var bundle = Bundle()
+                fragment.arguments = bundle
+                addCallFragment(fragment)
+            } else {
+                showMessage(R.string.wait_moment)
+            }
+
+        }
+        //sos
+        mom_sos_img.setOnClickListener {
+            if (!TextUtils.isEmpty(Constant.SIP_ID)) {
+                if (Constant.SCREENSTATE.equals(Display.STATE_ON)) {
+                    val tcpModel = OtherUtil.SOSCall(Constant.DEVICE_ID)
+                    TcpClient.getInstance().sendMsg(tcpModel.toJson())
+                    showMessage("紧急呼叫已发出!")
+                    SpeechUtil.getInstance().stopSpeak()
+                    SpeechUtil.getInstance().newSpeech("紧急呼叫已发出", true)
+                    AppTool.Time.delay(3000) {
+                        mom_sos_img.isEnabled = true
+                    }
+                    mom_sos_img.isEnabled = false
+                    clickTime = System.currentTimeMillis()
+                }
+            } else {
+                showMessage(R.string.no_custom)
+            }
+        }
+
+        mom_bt_ll_1.setOnClickListener {
+            if(!other_item__type.text.toString().equals("护士主机")){
+                callNetWorkPhone(other_item__type.text.toString())
+            }else{
+
+                callNetWork()
+            }
+
+        }
+        mom_bt_ll_2.setOnClickListener {
+            if(!other_item__type_2.text.toString().equals("护士主机")){
+                callNetWorkPhone(other_item__type_2.text.toString())
+            }else{
+
+                callNetWork()
+            }
+
+        }
+        mom_bt_ll_3.setOnClickListener {
+            if(!other_item__type_3.text.toString().equals("护士主机")){
+                callNetWorkPhone(other_item__type_3.text.toString())
+            }else{
+
+                callNetWork()
+            }
+        }
+        mom_bt_ll_4.setOnClickListener {
+            if(!other_item__type_4.text.toString().equals("护士主机")){
+                callNetWorkPhone(other_item__type_4.text.toString())
+            }else{
+
+                callNetWork()
+            }
+
+        }
+        mom_bt_ll_5.setOnClickListener {
+            if(!other_item__type_5.text.toString().equals("护士主机")){
+                callNetWorkPhone(other_item__type_5.text.toString())
+            }else{
+
+                callNetWork()
+            }
+        }
+        mom_bt_ll_6.setOnClickListener {
+            mom_bt_ll.visibility = View.GONE
+            mom_frame_new.visibility = View.GONE
+            mom_baby_sj.visibility = View.VISIBLE
+        }
+
+    }
+
+    fun back(){
+        mom_frame_new.visibility = View.VISIBLE
+        mom_baby_sj.visibility = View.GONE
+    }
+    private fun addCallFragment(fragment: Fragment) {
+        requireActivity().supportFragmentManager.beginTransaction().apply {
+            infoFragment?.let {
+                remove(it)
+            }
+            infoFragment = fragment
+            add(R.id.mom_frame_new, fragment)
+            commit()
+        }
+    }
+
+    private fun removeCallFragment() {
+        requireActivity().supportFragmentManager.beginTransaction().apply {
+            infoFragment?.let { remove(it) }
+            commit()
+        }
+    }
+    /**执行其他销毁操作*/
+    override fun destory() {
+
+    }
+
+    override fun showCustomInfo(customInfo: CustomerInfoVO) {
+        if (customInfo!=null){
+            mom_name.text=customInfo.named+"  "+customInfo.age + customInfo.ageUnit
+
+            if (Constant.DEVICE_STATUS == 0) {
+                mom_number_tx1.setText("房间号:   ")
+            } else {
+                mom_number_tx1.text ="房间号:"+ CommonUtils.subStringAfter2(Constant.BED_NAME, "-")
+            }
+
+            if (customInfo.memberId != null) {
+                Constant.MEMBER_ID = customInfo.memberId
+                presenter.getRelativeList(customInfo.memberId)
+            }
+
+        }
+
+    }
+
+    override fun showRelativeInfo(bedRelativeVO: ArrayList<BedRelativeVO>) {
+        if (bedRelativeVO.isNotEmpty()) {
+            val relativeInfo = bedRelativeVO.joinToString(separator = "/") {
+                "${it.true_name} ${it.relative_name}"
+            }
+            mom_baby_info.text = "宝宝:$relativeInfo"
+        }
+    }
+
+    override fun showEvents(data: ArrayList<EventDO>) {
+        if (data.size>0){
+            for ((index, e) in data.withIndex()) {
+                if (index < allOrders.size) {
+                    allOrders.set(index, e)
+                }else {
+                    allOrders.add(e)
+                }
+            }
+            deviceMenuapter = MomEventsMenuapter(activity, allOrders)
+            deviceMenuapter.setOnItemClickListener(this)
+            mom_baby_sj.adapter = deviceMenuapter
+            deviceMenuapter.updateData(allOrders)
+        }
+    }
+    private fun getRole(role_id: Int): RoleDO? {
+        if (Constant.ROLES != null && Constant.ROLES.size > 0) {
+            for (roleItem in Constant.ROLES) {
+                if (roleItem.roleId.equals(role_id)) {
+                    return roleItem
+                }
+            }
+            return null
+        } else {
+            return null
+        }
+    }
+
+    private fun getRole(role_name: String): RoleDO? {
+        if (Constant.ROLES != null && Constant.ROLES.size > 0) {
+            for (roleItem in Constant.ROLES) {
+                if (roleItem.roleName.contains(role_name)) {
+                    return roleItem
+                }
+            }
+            return null
+        } else {
+            return null
+        }
+    }
+
+    override fun loadRoles(roles: List<RoleDO>) {
+        Constant.ROLES = roles
+        Log.i(TAG, "角色列表:" + roles.toString())
+    }
+
+    override fun showRoleData(data: InteractionVO) {
+        if (data != null && data.id != null) {
+            val time = System.currentTimeMillis()
+            if (time - clickTime > 2000) {
+                //防止重复点击
+                if (!TextUtils.isEmpty(Constant.SIP_ID)) {
+                    //没有摄像头则只能拨打语音
+                    if (Constant.supportCamera) {
+                        CallTypeDialogHelper.showDialog(activity, object : CallTypeDialogHelper.ClickListener {
+                            override fun onVoiceClick() {
+                                (activity as CallingbedMomActivity).startRoleCall(Constant.VOICE_CALL,data.id )
+                            }
+                            override fun onVideoClick() {
+                                (activity as CallingbedMomActivity).startRoleCall(Constant.VIDEO_CALL,data.id)
+                            }
+                        })
+                    } else {
+                        (activity as CallingbedMomActivity).startCall(Constant.VOICE_CALL)
+                    }
+                } else {
+                    showMessage(R.string.no_custom)
+                }
+                clickTime = time
+            } else {
+                showMessage(R.string.wait_moment)
+            }
+        }else{
+            showMessage("获取呼叫数据失败")
+        }
+    }
+
+    override fun setPartSettings(partSetting: PartSettingDO) {
+        //设置自定义按钮功能
+        if(partSetting.customizeRoleCallFirst!=null && partSetting.customizeRoleCallFirst > 0){
+//          if (partSetting.customizeRoleCallFirst.equals(0)) { //都未启用
+//                mom_bt_ll_1.visibility = View.GONE
+//            } else
+                var role1 = getRole(partSetting.customizeRoleCallFirst)
+                if (role1 != null) {
+                    mom_bt_ll_1.visibility = View.VISIBLE
+                    other_item__type.text = role1.roleName
+//                    mom_bt_ll_1.setOnClickListener {
+//                        if (!TextUtils.isEmpty(Constant.SIP_ID)) {
+////                            callNetWorkPhone(role1.roleName)
+//                        }
+//                    }
+                } else {
+//                    mom_bt_ll_1.visibility = View.GONE
+                }
+        } else {
+//            mom_bt_ll_1.visibility = View.GONE
+        }
+
+            if(partSetting.customizeRoleCallSecond!=null && partSetting.customizeRoleCallSecond > 0){
+
+                    var role1 = getRole(partSetting.customizeRoleCallSecond)
+                    if (role1 != null) {
+                        mom_bt_ll_2.visibility = View.VISIBLE
+                        other_item__type_2.text =  role1.roleName
+//                        mom_bt_ll_2.setOnClickListener {
+//                            if ( !TextUtils.isEmpty(Constant.SIP_ID)) {
+////                                callNetWorkPhone(role1.roleName)
+//                            }
+//                        }
+                    } else {
+//                        mom_bt_ll_2.visibility = View.GONE
+                    }
+            } else {
+//                mom_bt_ll_2.visibility = View.GONE
+            }
+        if(partSetting.customizeRoleCallThird!=null && partSetting.customizeRoleCallThird > 0){
+
+                var role1 = getRole(partSetting.customizeRoleCallThird)
+                if (role1 != null) {
+                    mom_bt_ll_3.visibility = View.VISIBLE
+                    other_item__type_3.text =  role1.roleName
+//                    mom_bt_ll_3.setOnClickListener {
+//                        if ( !TextUtils.isEmpty(Constant.SIP_ID)) {
+////                                callNetWorkPhone(role1.roleName)
+//                        }
+//                    }
+                } else {
+//                    mom_bt_ll_3.visibility = View.GONE
+                }
+
+        } else {
+//            mom_bt_ll_3.visibility = View.GONE
+        }
+        if(partSetting.customizeRoleCallFourth!=null && partSetting.customizeRoleCallFourth > 0){
+                var role1 = getRole(partSetting.customizeRoleCallFourth)
+                if (role1 != null) {
+                    mom_bt_ll_4.visibility = View.VISIBLE
+                    other_item__type_4.text =  role1.roleName
+//                    mom_bt_ll_4.setOnClickListener {
+//                        if ( !TextUtils.isEmpty(Constant.SIP_ID)) {
+////                                callNetWorkPhone(role1.roleName)
+//                        }
+//                    }
+                } else {
+//                    mom_bt_ll_4.visibility = View.GONE
+                }
+
+        } else {
+//            mom_bt_ll_4.visibility = View.GONE
+        }
+        if(partSetting.customizeRoleCallFifth!=null && partSetting.customizeRoleCallFifth > 0){
+
+                var role1 = getRole(partSetting.customizeRoleCallFifth)
+                if (role1 != null) {
+                    mom_bt_ll_5.visibility = View.VISIBLE
+                    other_item__type_5.text =  role1.roleName
+//                    mom_bt_ll_5.setOnClickListener {
+//                        if ( !TextUtils.isEmpty(Constant.SIP_ID)) {
+////                                callNetWorkPhone(role1.roleName)
+//                        }
+//                    }
+                } else {
+//                    mom_bt_ll_5.visibility = View.GONE
+                }
+        } else {
+//            mom_bt_ll_5.visibility = View.GONE
+        }
+
+
+
+    }
+
+    private fun callNetWorkPhone(role_name: String) {
+            if (Constant.ROLES != null && Constant.ROLES!!.size > 0) {
+                var role: RoleDO? = getRole(role_name)
+                Log.w(TAG, role.toString())
+                if (role != null) {
+                    if (role. roleId!= 0 && Constant.DEVICE_ID != null) {
+                        presenter.getRoleData(Constant.DEVICE_ID, role.roleId)
+                    }
+                } else {
+                    showMessage("获取角色出错...")
+                }
+            }
+        }
+    private fun callNetWork() {
+        val time = System.currentTimeMillis()
+        if (time - clickTime > 2000) {
+            //防止重复点击
+            if (!TextUtils.isEmpty(Constant.SIP_ID)) {
+                //没有摄像头则只能拨打语音
+                if (Constant.supportCamera) {
+                    CallTypeDialogHelper.showDialog(activity, object : CallTypeDialogHelper.ClickListener {
+                        override fun onVoiceClick() {
+                            (activity as CallingbedMomActivity).startCall(Constant.VOICE_CALL)
+                        }
+                        override fun onVideoClick() {
+                            (activity as CallingbedMomActivity).startCall(Constant.VIDEO_CALL)
+                        }
+                    })
+                } else {
+                    (activity as CallingbedMomActivity).startCall(Constant.VOICE_CALL)
+                }
+            } else {
+                showMessage(R.string.no_custom)
+            }
+            clickTime = time
+        } else {
+            showMessage(R.string.wait_moment)
+        }
+    }
+
+    override fun onError(message: String, type: Int) {
+        showMessage(message)
+    }
+
+    override fun complete(message: String, type: Int) {
+
+    }
+
+    override fun start() {
+
+    }
+
+
+    override fun networkMonitor(state: NetState) {
+        state.filter(onWifi = {
+
+        }, onMobile = {
+
+        }, offline = {
+
+        })
+    }
+
+    override fun onItemClick(view: View, keyId: Int) {
+        //发送事件
+        //事件处理监听
+        if(Constant.TCP_CONNECTED) {
+            LoadingDialogHelper.showLoadingDialog(activity)
+            //使用新的方式发送事件
+            val tcpModel = EventUtil.eventKeyClick(Constant.DEVICE_ID, allOrders.get(keyId).id)
+            val transaction: TcpCallback = object : TcpCallback(tcpModel.tid) {
+                override fun onAck() {
+                    //事件发送成功
+                    SpeechUtil.getInstance().stopSpeak()
+                    SpeechUtil.getInstance().speak("已发送" + allOrders.get(keyId).name + "事件//请耐心等待")
+
+                    activity.runOnUiThread {
+                        LoadingDialogHelper.dismissCallDialog()
+                    }
+                }
+                override fun onSuccess(jsonObject: JSONObject) {
+                    //对方已接收
+                    Log.d(TAG, "target received event")
+                }
+
+                override fun onFailed(jsonObject: JSONObject) {
+                    // 这里写发送失败的方法
+                    // 提示?
+                    Log.e(TAG, "event send failed")
+                    SpeechUtil.getInstance().stopSpeak()
+                    SpeechUtil.getInstance().speak("事件发送失败,请稍后重试")
+                    val callbackString = jsonObject.getString(CALLBACK)
+                    activity.runOnUiThread {
+                        LoadingDialogHelper.dismissCallDialog()
+                        showMessage("Failed: $callbackString")
+                    }
+                }
+            }
+
+            TcpClient.getInstance().sendTcp(tcpModel, false,  transaction)
+        }else{
+            SpeechUtil.getInstance().stopSpeak()
+            SpeechUtil.getInstance().speak("设备没有网络//请稍后重试")
+        }
+    }
+
+    override fun onStart() {
+        EventBus.getDefault().register(this)
+        super.onStart()
+    }
+
+    override fun onStop() {
+        EventBus.getDefault().unregister(this)
+        super.onStop()
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onMoonEvent(messageEvent: MessageEvent) {
+        if (Constant.EVENT_MOM_return == messageEvent.type) {
+            mom_frame_new.visibility = View.GONE
+            mom_bt_ll.visibility = View.GONE
+            mom_baby_sj.visibility = View.VISIBLE
+
+            removeCallFragment()
+        }
+    }
+
+
+
+}

+ 1 - 1
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/NurseFragment.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingdoor.fragment
+package com.wdkl.app.ncs.callingbed.fragment
 
 import android.content.Intent
 import com.enation.javashop.net.engine.model.NetState

+ 72 - 2
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/SipCallFragment.kt

@@ -1,5 +1,7 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
+import android.graphics.Color
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.os.SystemClock
@@ -9,6 +11,7 @@ import android.view.View
 import android.widget.SeekBar
 import com.alibaba.fastjson.JSONObject
 import com.google.gson.Gson
+import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.dialog.ReinforcementsDialogHelper
 import com.wdkl.app.ncs.callingbed.helper.SerialPortHelper
@@ -35,6 +38,7 @@ import com.wdkl.ncs.android.middleware.utils.RingPlayHelper
 
 
 import kotlinx.android.synthetic.main.sky_voice_call_layout.*
+import kotlinx.android.synthetic.main.view_title_layout.*
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.linphone.core.Core
@@ -56,12 +60,14 @@ class SipCallFragment: BaseCallFragment() {
     private var sipCore: Core? = null
     private var volume = 60
 
+    var role_id: Int = 0
     override fun getLayId(): Int {
         return R.layout.sky_voice_call_layout
     }
 
     override fun init() {
-
+        role_id = arguments?.getInt("role_id")?: 0
+        showui()
 
         //初始化计时器
         initCountDownTimer(sky_voice_call_timeout)
@@ -121,6 +127,63 @@ class SipCallFragment: BaseCallFragment() {
             }
         }
     }
+    private fun showui(){
+        if (Constant.NursingTitle.equals("进入护理")){
+            view_calling_bed_layout_title.setBackgroundColor(Color.parseColor("#FF8484"))
+            calling_bed_layout_call_mian.setBackgroundColor(Color.parseColor("#FF8484"))
+            view_title_layout_return.visibility=View.GONE
+            view_title_layout_tv_no.visibility =View.VISIBLE
+            view_title_layout_tv_no.text ="护理中"
+            sky_voice_call_bg_img.visibility =View.VISIBLE
+        }else if (BuildConfig.is_mom.toBoolean()){
+            view_calling_bed_layout_title.setBackgroundColor(Color.parseColor("#FF8484"))
+            calling_bed_layout_call_mian.setBackgroundColor(Color.parseColor("#FF8484"))
+            view_title_layout_tv_hospital_name.setText(R.string.str_back)
+            view_title_layout_img.visibility = View.VISIBLE
+            call_menu_support.visibility = View.GONE
+            call_menu_call_nurse.visibility = View.GONE
+            view_title_layout_return.visibility=View.GONE
+            view_title_lay_day_tx.setTextColor(Color.WHITE)
+            view_title_lay_time_tx.setTextColor(Color.WHITE)
+
+        } else{
+            view_calling_bed_layout_title.setBackgroundColor(Color.TRANSPARENT);
+            calling_bed_layout_call_mian.setBackgroundResource(R.mipmap.call_bg)
+            view_title_layout_tv_hospital_name.setText(R.string.str_back)
+            view_title_layout_img.visibility = View.VISIBLE
+        }
+
+        view_title_lay_day_img.setImageResource(R.mipmap.riqi_b)
+        view_title_lay_time_img.setImageResource(R.mipmap.shijian_b)
+        //网络图标
+        if ( Constant.network_state == 1){
+            view_title_layout_iv_wifi.visibility = View.VISIBLE
+            view_title_layout_iv_ethernet.visibility = View.GONE
+            view_title_layout_iv_wifi.setImageResource(R.mipmap.ic_wifi_fail)
+        }else if ( Constant.network_state == 2){
+            view_title_layout_iv_wifi.visibility = View.GONE
+            view_title_layout_iv_ethernet.visibility = View.VISIBLE
+            view_title_layout_iv_ethernet.setImageResource(R.mipmap.ic_ethernet_success_w)
+        }else{
+            view_title_layout_iv_wifi.visibility = View.GONE
+            view_title_layout_iv_ethernet.visibility = View.VISIBLE
+            view_title_layout_iv_ethernet.setImageResource(R.mipmap.ic_ethernet_fail)
+        }
+        //蓝牙图标
+        if ( Constant.BT_state == 0){
+            view_title_layout_iv_bt.setImageResource(R.mipmap.lanya_b)
+        }
+        //白天/黑夜
+        if (Constant.day_state == 0){
+            view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_daylight_w)
+        }else{
+            view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_night_w)
+        }
+        view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_fail)
+
+
+
+    }
 
     override fun bindEvent() {
 
@@ -267,7 +330,14 @@ class SipCallFragment: BaseCallFragment() {
 
     private fun startOutgoing() {
         callSuccess = false
-        val outCallTcp = VoiceUtil.voiceCall(Constant.DEVICE_ID, RoleTypeEnum.NURSE.name)
+        val outCallTcp: TcpModel?
+//        val outCallTcp = VoiceUtil.voiceCall(Constant.DEVICE_ID, RoleTypeEnum.NURSE.name)
+
+        if (role_id==null||role_id==0){
+              outCallTcp = VoiceUtil.voiceCall(Constant.DEVICE_ID, RoleTypeEnum.NURSE.name)
+        }else{
+             outCallTcp = VoiceUtil.voiceCall(Constant.DEVICE_ID,  role_id)
+        }
 
         Constant.CALL_STATE = Constant.CALL_OUTGOING
         sky_voice_call_outgoing.visibility = View.VISIBLE

+ 26 - 3
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/SkyCallFragment.kt

@@ -11,6 +11,7 @@ import android.view.ViewGroup
 import android.widget.SeekBar
 import com.alibaba.fastjson.JSONObject
 import com.google.gson.Gson
+import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.dialog.ReinforcementsDialogHelper
 import com.wdkl.app.ncs.callingbed.helper.SerialPortHelper
@@ -78,13 +79,14 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
     private var volume = 60
 
     private var janusInit = false
+    var role_id: Int = 0
 
     override fun getLayId(): Int {
         return R.layout.sky_voice_call_layout
     }
 
     override fun init() {
-
+        role_id = arguments?.getInt("role_id")?: 0
         showui()
         //初始化计时器
         initCountDownTimer(sky_voice_call_timeout)
@@ -118,12 +120,24 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
             view_title_layout_tv_no.visibility =View.VISIBLE
             view_title_layout_tv_no.text ="护理中"
             sky_voice_call_bg_img.visibility =View.VISIBLE
+        }else if (BuildConfig.is_mom.toBoolean()){
+            view_calling_bed_layout_title.setBackgroundColor(Color.parseColor("#FF8484"))
+            calling_bed_layout_call_mian.setBackgroundColor(Color.parseColor("#FF8484"))
+            view_title_layout_tv_hospital_name.setText(R.string.str_back)
+            view_title_layout_img.visibility = View.VISIBLE
+            call_menu_support.visibility = View.GONE
+            call_menu_call_nurse.visibility = View.GONE
+            view_title_layout_return.visibility=View.GONE
+            view_title_lay_day_tx.setTextColor(Color.WHITE)
+            view_title_lay_time_tx.setTextColor(Color.WHITE)
+
         }else{
             view_calling_bed_layout_title.setBackgroundColor(Color.TRANSPARENT);
             calling_bed_layout_call_mian.setBackgroundResource(R.mipmap.call_bg)
             view_title_layout_tv_hospital_name.setText(R.string.str_back)
             view_title_layout_img.visibility = View.VISIBLE
         }
+
         view_title_lay_day_img.setImageResource(R.mipmap.riqi_b)
         view_title_lay_time_img.setImageResource(R.mipmap.shijian_b)
         //网络图标
@@ -379,10 +393,19 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
         var outCallTcp: TcpModel?
         if (Constant.CALL_TYPE == Constant.VIDEO_CALL) {
             //VoiceUtil.startVideoCall(Constant.DEVICE_ID)
-            outCallTcp = VoiceUtil.videoCall(Constant.DEVICE_ID, RoleTypeEnum.NURSE.name)
+            if (role_id==null||role_id==0){
+                outCallTcp = VoiceUtil.videoCall(Constant.DEVICE_ID, RoleTypeEnum.NURSE.name)
+                }else{
+              outCallTcp = VoiceUtil.videoCall(Constant.DEVICE_ID,role_id)
+          }
+
         } else {
             //VoiceUtil.startAudioCall(Constant.DEVICE_ID)
-            outCallTcp = VoiceUtil.voiceCall(Constant.DEVICE_ID, RoleTypeEnum.NURSE.name)
+            if (role_id==null||role_id==0){
+                outCallTcp = VoiceUtil.voiceCall(Constant.DEVICE_ID, RoleTypeEnum.NURSE.name)
+            }else{
+                outCallTcp = VoiceUtil.voiceCall(Constant.DEVICE_ID, role_id)
+            }
         }
 
         Constant.CALL_STATE = Constant.CALL_OUTGOING

+ 31 - 10
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/VoiceMsgFragment.kt

@@ -9,22 +9,30 @@ import com.wdkl.app.ncs.callingbed.helper.HttpHelper
 import com.wdkl.app.ncs.callingbed.helper.RecordHelper
 import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
 import com.wdkl.ncs.android.lib.base.BaseFragment
+import com.wdkl.ncs.android.lib.utils.debugLog
 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.common.MessageEvent
 import com.wdkl.ncs.android.middleware.logic.contract.callingbed.BedVoiceFragmentContract
+import com.wdkl.ncs.android.middleware.logic.contract.callingbed.VoiceFragmentContract
 import com.wdkl.ncs.android.middleware.logic.presenter.callingbed.BedVoiceFragmentPresenter
+import com.wdkl.ncs.android.middleware.logic.presenter.callingbed.VoiceFragmentPresenter
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.channel.ImUtil
 import com.wdkl.ncs.android.middleware.tcp.enums.RoleTypeEnum
 import kotlinx.android.synthetic.main.voice_msg_lay.*
+import okhttp3.MediaType
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import org.greenrobot.eventbus.EventBus
 import java.io.File
 import javax.inject.Inject
 /**
  * 留言
  * */
-class VoiceMsgFragment @Inject constructor() : BaseFragment<BedVoiceFragmentPresenter, VoiceMsgLayBinding>(), BedVoiceFragmentContract.View {
+class VoiceMsgFragment @Inject constructor() : BaseFragment<VoiceFragmentPresenter, VoiceMsgLayBinding>(), VoiceFragmentContract.View {
     val TAG = "VoiceMsgFragment"
 
     var downTime : Long = 0
@@ -33,7 +41,7 @@ class VoiceMsgFragment @Inject constructor() : BaseFragment<BedVoiceFragmentPres
     var cancel : Boolean = false
     lateinit var voiceFile : String
 
-    private val urlManager = UrlManager.build()
+    //private val urlManager = UrlManager.build()
 
     override fun getLayId(): Int {
         return R.layout.voice_msg_lay
@@ -48,6 +56,10 @@ class VoiceMsgFragment @Inject constructor() : BaseFragment<BedVoiceFragmentPres
     }
 
     override fun bindEvent() {
+        //debugLog(TAG,"bindEvent")
+        voice_call_img.setOnClickListener {
+            EventBus.getDefault().post(MessageEvent("Exit", Constant.EVENT_MOM_return))
+        }
         tv_voice_button.setOnTouchListener { v, event ->
             when(event.action) {
                 MotionEvent.ACTION_DOWN -> {
@@ -83,7 +95,11 @@ class VoiceMsgFragment @Inject constructor() : BaseFragment<BedVoiceFragmentPres
                         showMessage("语音留言已取消")
                     } else {
                         //上传语音留言
-                        val callback = object : HttpHelper.UploadCallback {
+                        val part = MultipartBody.Part.createFormData("file", voiceFile, RequestBody.create(MediaType.parse("multipart/form-data"), File(voiceFile)))
+                        presenter.uploadVoiceMsg(part)
+
+
+                        /*val callback = object : HttpHelper.UploadCallback {
                             override fun onFail() {
                                 activity.runOnUiThread {
                                     showMessage("留言发送失败!")
@@ -92,13 +108,13 @@ class VoiceMsgFragment @Inject constructor() : BaseFragment<BedVoiceFragmentPres
 
                             override fun onSuccess(data: String) {
                                 activity.runOnUiThread {
-                                    val tcpModel = ImUtil.imMsg(Constant.DEVICE_ID, data, RoleTypeEnum.NURSE.name)
+                                    val tcpModel = ImUtil.imMsg(Constant.DEVICE_ID, data)
                                     TcpClient.getInstance().sendMsg(tcpModel.toJson())
                                     showMessage("留言发送成功!")
                                 }
                             }
                         }
-                        HttpHelper.upload(urlManager.base + Constant.UPLOAD_VOICE_MSG_URL, File(voiceFile), TAG, callback)
+                        HttpHelper.upload(urlManager.base + Constant.UPLOAD_VOICE_MSG_URL, File(voiceFile), callback)*/
                     }
                 }
             }
@@ -107,22 +123,27 @@ class VoiceMsgFragment @Inject constructor() : BaseFragment<BedVoiceFragmentPres
         }
     }
 
-    override fun destory() {
-
-    }
-
     override fun uploadResponse(result: String) {
+        val tcpModel = ImUtil.imMsg(Constant.DEVICE_ID, result)
+        TcpClient.getInstance().sendMsg(tcpModel.toJson())
+        showMessage("留言发送成功!")
+        EventBus.getDefault().post(MessageEvent("Exit", Constant.EVENT_MOM_return))
+    }
 
+    override fun destory() {
+        debugLog(TAG,"destory")
     }
 
     override fun onError(message: String, type: Int) {
-        showMessage(message)
+        showMessage("留言发送失败!")
     }
 
     override fun complete(message: String, type: Int) {
+        //
     }
 
     override fun start() {
+        //
     }
 
     override fun networkMonitor(state: NetState) {

+ 1 - 1
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/YhFragment.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingdoor.fragment
+package com.wdkl.app.ncs.callingbed.fragment
 
 
 import android.view.View

+ 3 - 0
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/hardware/HardWareFactory.java

@@ -6,6 +6,7 @@ import com.wdkl.app.ncs.callingbed.hardware.imp.A133HardTools;
 import com.wdkl.app.ncs.callingbed.hardware.imp.WdchHardTools;
 import com.wdkl.app.ncs.callingbed.hardware.imp.YldHardTools;
 import com.wdkl.app.ncs.callingbed.hardware.imp.Z3128HardTools;
+import com.wdkl.app.ncs.callingbed.hardware.imp.ZKEHardTools;
 import com.wdkl.app.ncs.callingbed.hardware.imp.ZXHardTools;
 import com.wdkl.ncs.android.middleware.common.Constant;
 
@@ -28,6 +29,8 @@ public  class HardWareFactory {
                 hardTools = A133HardTools.getInstance();
             } else if(BuildConfig.flag.equals(Constant.DEV_W_ZX_8)) {
                 hardTools = new ZXHardTools();
+            }else if(BuildConfig.flag.equals(Constant.DEV_W_KAER)) {
+                hardTools = new ZKEHardTools();
             }
         }
         return hardTools ;

+ 3 - 0
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/hardware/imp/A133HardTools.java

@@ -109,6 +109,9 @@ public class A133HardTools extends HardTools {
             //隐藏虚拟导航栏
             zhylManager.disp_setNavigationBar(false);
 
+            ZhylManager.getInstance(BaseApplication.appContext).sys_setDacVolume(BaseApplication.appContext,140);
+            ZhylManager.getInstance(BaseApplication.appContext).sys_setMic1gain(BaseApplication.appContext,18);
+
             //切换mic
             if (!zhylManager.sys_getMICEnable()) {
                 zhylManager.sys_setMICEnable(true);

+ 154 - 0
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/hardware/imp/ZKEHardTools.java

@@ -0,0 +1,154 @@
+package com.wdkl.app.ncs.callingbed.hardware.imp;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.util.Log;
+import com.wdkl.app.ncs.callingbed.activity.AppUpdateActivity;
+import com.wdkl.app.ncs.callingbed.hardware.HardTools;
+import com.wdkl.app.ncs.callingbed.helper.AppUpdateHelper;
+import com.wdkl.app.ncs.callingbed.helper.NetHelper;
+import com.wdkl.app.ncs.callingbed.helper.VoiceManagerUtil;
+import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.middleware.common.Constant;
+import com.wdkl.ncs.android.middleware.utils.AppUtil;
+
+import java.util.List;
+
+import serialporttest.utils.SerialPortUtil;
+import serialporttest.utils.SerialPortUtilHost;
+
+/**
+ * W——KR主机硬件控制类
+ *
+ * */
+public class ZKEHardTools extends HardTools {
+
+    public static final String HARDWDT_SERVICE = "Z3128HardTools";
+    private Application app;
+
+
+    private static class Z3128HardToolsHolder{
+        private final  static ZKEHardTools z3128HardTools = new ZKEHardTools();
+    }
+
+    public static ZKEHardTools getInstance(){
+        return Z3128HardToolsHolder.z3128HardTools;
+    }
+
+    @Override
+    public void init() {
+
+    }
+
+    @Override
+    public void unInit() {
+
+    }
+//    @Override
+//    public void toggleStatusBar(Context context,boolean is) {
+//        if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+//            StatusBarHelper.toggleStatusBar(context, is);
+//        }
+//
+//    }
+    @Override
+    public void resetDevice() {
+//        SerialPortHelper.resetDevice();
+    }
+
+//    @Override
+//    public void setAudioMode(Context context, int mode) {
+//
+//    }
+
+//    @Override
+//    public void setAudioMute(Context context, boolean mute) {
+//        VoiceManagerUtil.setAudioMute(BaseApplication.appContext, mute);
+//    }
+
+    @Override
+    public void resetDevicex(Application application) {
+        AppUpdateHelper.reboot(application);
+    }
+    @Override
+    public void Registration(Context context) {
+        //获取mac地址
+        Constant.LOCAL_MAC = NetHelper.getInstance().getIMEI();
+        Constant.DEVICE_REGISTER_ID = Constant.LOCAL_MAC;
+    }
+
+//    @Override
+//    public void setSerial(NurseHomeActivity activity) {
+//        activity.kaerregReceiver();
+//        activity.updatePower();
+//
+//    }
+
+    @Override
+    public void uninstallApp(Context context, boolean isuninstall, String name) {
+        //卸载原来二代系统apk
+        if (isuninstall) {
+            Thread thread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    // 在子线程中执行的代码
+                    if (checkAppExist(context,name)) {
+                        AppUtil.uninstallApp(name);
+                    }
+                }
+            });
+        }
+    }
+
+    @Override
+    public void setSOSStart() {
+//        SOSHelper.sosStart();
+    }
+
+    @Override
+    public void setSOSStop() {
+//        SOSHelper.sosStop();
+    }
+    @Override
+    public void setDoorLight(int type) {
+//        if (type==1){
+//            //绿色
+//            SerialPortHelper.setDoorLight(1, Constant.nursingColor);
+//        }else if (type==2){
+//            //白色
+//            SerialPortHelper.setDoorLight(1, "111"); //白色
+//        }else if (type==3){
+//            //红色
+//            SerialPortHelper.setDoorLight(1, "200"); //红色闪烁
+//        }else if (type==4){
+//            //红色
+//            SerialPortHelper.setDoorLight(0, "000"); //关闭
+//        }
+    }
+
+    @Override
+    public void installApk(AppUpdateActivity context) {
+    }
+
+    @Override
+    public void startInstallApk(AppUpdateActivity context) {
+
+    }
+
+    private boolean checkAppExist(Context context, String name) {
+        PackageManager packageManager = context.getPackageManager();
+        List<PackageInfo> packageInfoList = packageManager.getInstalledPackages(0);
+        boolean appExist = false;
+        for (PackageInfo pInfo : packageInfoList) {
+            if (name.equals(pInfo.packageName)) {
+                appExist = true;
+                break;
+            }
+        }
+        Log.e("wdkl_app", "callingdoor app exist: " + appExist);
+        return appExist;
+    }
+}

+ 15 - 0
android_bed/src/main/res/drawable/shape_baby_bg_title.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:type="linear"
+        android:useLevel="true"
+        android:startColor="#fffc8992"
+        android:endColor="#fff76f78"
+        android:angle="180" />
+    <corners
+        android:topLeftRadius="@dimen/d30"
+        android:topRightRadius="@dimen/d30"
+        android:bottomLeftRadius="@dimen/d2"
+        android:bottomRightRadius="@dimen/d2"
+        />
+
+</shape>

+ 12 - 0
android_bed/src/main/res/drawable/shape_baby_bg_title2.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FDA1A9"
+        />
+    <corners
+        android:topLeftRadius="@dimen/d30"
+        android:topRightRadius="@dimen/d30"
+        android:bottomLeftRadius="@dimen/d2"
+        android:bottomRightRadius="@dimen/d2"
+        />
+
+</shape>

+ 15 - 0
android_bed/src/main/res/drawable/shape_baby_bg_title3.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:type="linear"
+        android:useLevel="true"
+        android:startColor="#fffc8992"
+        android:endColor="#fff76f78"
+        android:angle="180" />
+    <corners
+        android:topLeftRadius="@dimen/d2"
+        android:topRightRadius="@dimen/d19"
+        android:bottomLeftRadius="@dimen/d20"
+        android:bottomRightRadius="@dimen/d2"
+        />
+
+</shape>

+ 9 - 0
android_bed/src/main/res/drawable/shape_mom_baby_name_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FEF2F3"
+        />
+    <corners
+    android:radius="@dimen/d20"
+        />
+
+</shape>

+ 9 - 0
android_bed/src/main/res/drawable/shape_mom_sj_rv_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="#FFF2F3"
+        />
+    <stroke android:width="2dp" android:color="#FEB8BF" />
+    <corners android:radius="@dimen/d18" />
+</shape>

+ 599 - 0
android_bed/src/main/res/layout-land/acivity_time_setting.xml

@@ -0,0 +1,599 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:id="@+id/time_setting"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/delete_text_color"
+       >
+
+<!--        android:background="#F7F7F7"-->
+
+        <include
+            android:id="@+id/activity_calling_door_layout_title"
+            layout="@layout/view_title_layout"
+            />
+
+    <LinearLayout
+        android:id="@+id/set_time_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        >
+        <RelativeLayout
+            android:layout_width="@dimen/d283"
+            android:layout_height="match_parent"
+            android:background="@drawable/shape_bed_bg"
+            android:layout_marginTop="@dimen/d10"
+            android:layout_marginLeft="@dimen/d24"
+            android:layout_marginBottom="@dimen/d20"
+            android:orientation="vertical"
+
+            >
+            <ImageView
+                android:id="@+id/time_s_img_1"
+                android:layout_width="@dimen/d22"
+                android:layout_height="@dimen/d22"
+                android:layout_marginTop="@dimen/d26"
+                android:layout_marginLeft="@dimen/d18"
+                android:layout_marginRight="@dimen/d8"
+               android:src="@mipmap/d_shi"
+                />
+
+            <TextView
+                android:id="@+id/time_s_tx_1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/time_s_img_1"
+                android:text="请选择"
+                android:textSize="@dimen/font_size_18"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:layout_marginTop="@dimen/d24"
+                />
+
+            <TextView
+                android:id="@+id/time_s_tx_2"
+                android:layout_width="@dimen/d248"
+                android:layout_height="@dimen/d48"
+                android:layout_below="@+id/time_s_tx_1"
+                android:gravity="center"
+                android:text="吸氧"
+                android:clickable="true"
+                android:textSize="@dimen/font_size_16"
+                android:textColor="@color/text_name_color"
+                android:layout_marginTop="@dimen/d20"
+                android:layout_marginLeft="@dimen/d18"
+                android:background="@drawable/shape_time_name_bg"
+                />
+            <TextView
+                android:id="@+id/time_s_tx_3"
+                android:layout_width="@dimen/d248"
+                android:layout_height="@dimen/d48"
+                android:layout_below="@+id/time_s_tx_2"
+                android:gravity="center"
+                android:text="输液"
+                android:clickable="true"
+                android:textSize="@dimen/font_size_16"
+                android:textColor="@color/text_name_color"
+                android:layout_marginTop="@dimen/d20"
+                android:layout_marginLeft="@dimen/d18"
+                android:background="@drawable/shape_time_name_bg"
+                />
+            <TextView
+                android:id="@+id/time_s_tx_4"
+                android:layout_width="@dimen/d248"
+                android:layout_height="@dimen/d48"
+                android:layout_below="@+id/time_s_tx_3"
+                android:gravity="center"
+                android:text="皮试"
+                android:textSize="@dimen/font_size_16"
+                android:clickable="true"
+                android:textColor="@color/text_name_color"
+                android:layout_marginTop="@dimen/d20"
+                android:layout_marginLeft="@dimen/d18"
+                android:background="@drawable/shape_time_name_bg"
+                />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            >
+          <RelativeLayout
+              android:layout_width="match_parent"
+              android:layout_height="@dimen/d265"
+              android:background="@drawable/shape_bed_bg"
+              android:layout_marginTop="@dimen/d20"
+              android:layout_marginRight="@dimen/d24"
+              android:layout_marginLeft="@dimen/d15"
+              >
+              <TextView
+                  android:id="@+id/time_s_tx_5"
+                  android:layout_width="@dimen/d140"
+                  android:layout_height="@dimen/d90"
+                  android:gravity="center"
+                  android:text="10分钟"
+                  android:clickable="true"
+                  android:textStyle="bold"
+                  android:textSize="@dimen/font_size_22"
+                  android:textColor="@color/text_name_color"
+                  android:layout_marginTop="@dimen/d20"
+                  android:layout_marginLeft="@dimen/d25"
+                  android:background="@drawable/shape_time_f_bg"
+                  />
+              <TextView
+                  android:id="@+id/time_s_tx_6"
+                  android:layout_width="@dimen/d140"
+                  android:layout_height="@dimen/d90"
+                  android:layout_toRightOf="@+id/time_s_tx_5"
+                  android:gravity="center"
+                  android:text="15分钟"
+                  android:clickable="true"
+                  android:textStyle="bold"
+                  android:textSize="@dimen/font_size_22"
+                  android:textColor="@color/text_name_color"
+                  android:layout_marginTop="@dimen/d16"
+                  android:layout_marginLeft="@dimen/d25"
+                  android:background="@drawable/shape_time_f_bg"
+                  />
+              <TextView
+                  android:id="@+id/time_s_tx_7"
+                  android:layout_width="@dimen/d140"
+                  android:layout_height="@dimen/d90"
+                  android:layout_toRightOf="@+id/time_s_tx_6"
+                  android:gravity="center"
+                  android:text="20分钟"
+                  android:clickable="true"
+                  android:textStyle="bold"
+                  android:textSize="@dimen/font_size_22"
+                  android:textColor="@color/text_name_color"
+                  android:layout_marginTop="@dimen/d16"
+                  android:layout_marginLeft="@dimen/d25"
+                  android:background="@drawable/shape_time_f_bg"
+                  />
+              <TextView
+                  android:id="@+id/time_s_tx_8"
+                  android:layout_width="@dimen/d140"
+                  android:layout_height="@dimen/d90"
+                  android:layout_toRightOf="@+id/time_s_tx_7"
+                  android:gravity="center"
+                  android:text="25分钟"
+                  android:clickable="true"
+                  android:textSize="@dimen/font_size_22"
+                  android:textStyle="bold"
+                  android:textColor="@color/text_name_color"
+                  android:layout_marginTop="@dimen/d16"
+                  android:layout_marginLeft="@dimen/d25"
+                  android:background="@drawable/shape_time_f_bg"
+                  />
+
+              <TextView
+                  android:id="@+id/time_s_tx_9"
+                  android:layout_width="@dimen/d140"
+                  android:layout_height="@dimen/d90"
+                  android:layout_below="@+id/time_s_tx_5"
+                  android:gravity="center"
+                  android:text="30分钟"
+                  android:clickable="true"
+                  android:textSize="@dimen/font_size_22"
+                  android:textStyle="bold"
+                  android:textColor="@color/text_name_color"
+                  android:layout_marginTop="@dimen/d20"
+                  android:layout_marginLeft="@dimen/d25"
+                  android:background="@drawable/shape_time_f_bg"
+                  />
+              <TextView
+                  android:id="@+id/time_s_tx_10"
+                  android:layout_width="@dimen/d140"
+                  android:layout_height="@dimen/d90"
+                  android:layout_below="@+id/time_s_tx_5"
+                  android:layout_toRightOf="@+id/time_s_tx_9"
+                  android:gravity="center"
+                  android:text="60分钟"
+                  android:clickable="true"
+                  android:textSize="@dimen/font_size_22"
+                  android:textStyle="bold"
+                  android:textColor="@color/text_name_color"
+                  android:layout_marginTop="@dimen/d20"
+                  android:layout_marginLeft="@dimen/d25"
+                  android:background="@drawable/shape_time_f_bg"
+                  />
+              <TextView
+                  android:id="@+id/time_s_tx_11"
+                  android:layout_width="@dimen/d140"
+                  android:layout_height="@dimen/d90"
+                  android:layout_below="@+id/time_s_tx_5"
+                  android:layout_toRightOf="@+id/time_s_tx_10"
+                  android:gravity="center"
+                  android:text="90分钟"
+                  android:clickable="true"
+                  android:textSize="@dimen/font_size_22"
+                  android:textStyle="bold"
+                  android:textColor="@color/text_name_color"
+                  android:layout_marginTop="@dimen/d20"
+                  android:layout_marginLeft="@dimen/d25"
+                  android:background="@drawable/shape_time_f_bg"
+                  />
+              <TextView
+                  android:id="@+id/time_s_tx_12"
+                  android:layout_width="@dimen/d140"
+                  android:layout_height="@dimen/d90"
+                  android:layout_below="@+id/time_s_tx_5"
+                  android:layout_toRightOf="@+id/time_s_tx_11"
+                  android:gravity="center"
+                  android:text="120分钟"
+                  android:clickable="true"
+                  android:textSize="@dimen/font_size_22"
+                  android:textStyle="bold"
+                  android:textColor="@color/text_name_color"
+                  android:layout_marginTop="@dimen/d20"
+                  android:layout_marginLeft="@dimen/d25"
+                  android:background="@drawable/shape_time_f_bg"
+                  />
+
+
+          </RelativeLayout>
+
+          <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/shape_bed_bg"
+                android:layout_marginTop="@dimen/d16"
+                android:layout_marginRight="@dimen/d24"
+                android:layout_marginLeft="@dimen/d15"
+                android:layout_marginBottom="@dimen/d20"
+                >
+              <LinearLayout
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  android:layout_marginTop="@dimen/d43"
+                  android:layout_marginLeft="@dimen/d65"
+                  >
+
+                  <TextView
+                      android:id="@+id/time_s_tx_13"
+                      android:layout_width="@dimen/d65"
+                      android:layout_height="@dimen/d65"
+                      android:text="-5"
+                      android:gravity="center"
+                      android:textStyle="bold"
+                      android:textSize="@dimen/font_size_24"
+                      android:clickable="true"
+                      android:textColor="@color/white"
+                      android:background="@drawable/shape_papg_bg"
+                      />
+
+                  <TextView
+                      android:id="@+id/time_s_tx_14"
+                      android:layout_width="@dimen/d65"
+                      android:layout_height="@dimen/d65"
+                      android:layout_marginLeft="@dimen/d16"
+                      android:text="-1"
+                      android:gravity="center"
+                      android:textStyle="bold"
+                      android:textSize="@dimen/font_size_24"
+                      android:clickable="true"
+                      android:textColor="@color/text_name_color"
+                      android:background="@drawable/shape_time_s_bg"
+                      />
+                  <LinearLayout
+                      android:layout_width="@dimen/d200"
+                      android:layout_height="@dimen/d64"
+                      android:layout_marginLeft="@dimen/d14"
+                      android:layout_marginRight="@dimen/d14"
+                      android:background="@drawable/selector_nuser_ed_d"
+                      >
+                      <EditText
+                          android:id="@+id/ed_settime"
+                          android:layout_width="@dimen/d120"
+                          android:layout_height="@dimen/d64"
+                          android:hint="30"
+                          android:textColor="@color/black"
+                          android:gravity="center"
+                          android:background="@android:color/transparent"
+                          android:textSize="@dimen/font_size_28"
+                          android:textStyle="bold"
+
+                          />
+                      <TextView
+                          android:layout_width="@dimen/d65"
+                          android:layout_height="@dimen/d65"
+                          android:text="分钟"
+                          android:gravity="center"
+                          android:textStyle="bold"
+                          android:textSize="@dimen/font_size_24"
+                          android:textColor="@color/text_name_color"
+
+
+                          />
+                  </LinearLayout>
+                  <TextView
+                      android:id="@+id/time_s_tx_15"
+                      android:layout_width="@dimen/d65"
+                      android:layout_height="@dimen/d65"
+                      android:text="+1"
+                      android:gravity="center"
+                      android:textStyle="bold"
+                      android:textSize="@dimen/font_size_24"
+                      android:clickable="true"
+                      android:layout_marginRight="@dimen/d16"
+                      android:textColor="@color/text_name_color"
+                      android:background="@drawable/shape_time_s_bg"
+                      />
+
+                  <TextView
+                      android:id="@+id/time_s_tx_16"
+                      android:layout_width="@dimen/d65"
+                      android:layout_height="@dimen/d65"
+                      android:text="+5"
+                      android:gravity="center"
+                      android:textStyle="bold"
+                      android:textSize="@dimen/font_size_24"
+                      android:clickable="true"
+                      android:textColor="@color/white"
+                      android:background="@drawable/shape_papg_bg"
+                      />
+
+
+
+              </LinearLayout>
+
+
+
+
+
+              <TextView
+                  android:id="@+id/nurse_msg_bt"
+                  android:layout_width="@dimen/d420"
+                  android:layout_height="@dimen/d60"
+                  android:gravity="center"
+                  android:text="立即添加"
+                  android:clickable="true"
+                  android:textColor="@color/white"
+                  android:layout_centerInParent="true"
+                  android:layout_alignParentBottom="true"
+                  android:layout_marginBottom="@dimen/d43"
+                  android:background="@drawable/shape_main_hos_txt_bg"
+                  android:layout_marginTop="@dimen/d26"
+                  android:textSize="@dimen/font_size_20" />
+
+            </RelativeLayout>
+
+
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/tj_time_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/delete_text_color"
+        android:orientation="horizontal"
+        >
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginLeft="@dimen/d30"
+            android:layout_marginTop="@dimen/d100"
+            >
+            <LinearLayout
+                android:id="@+id/time_ll_1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@mipmap/daojishi_wu"
+                android:layout_gravity="center"
+                android:gravity="center_horizontal"
+                >
+
+                <TextView
+                    android:id="@+id/time_ll_tx_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d89"
+                    android:text="倒计时中"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_12"
+                    />
+                <TextView
+                    android:id="@+id/time_ll_tx_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d20"
+                    android:text="00:00:00"
+                    android:textColor="#5F759B"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/font_size_28"
+                    />
+
+                <TextView
+                    android:id="@+id/time_ll_bt_1"
+                    android:layout_width="@dimen/d125"
+                    android:layout_height="@dimen/d33"
+                    android:layout_marginTop="@dimen/d28"
+                    android:text="添加倒计时"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:gravity="center"
+                    android:clickable="true"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/font_size_13"
+                    android:background="@drawable/shape_time_ll_name_bg"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/time_ll_bt_2"
+                android:layout_width="@dimen/d125"
+                android:layout_height="@dimen/d33"
+                android:text="关闭该倒计时"
+                android:textColor="@color/delete_text_color"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:textStyle="bold"
+                android:visibility="gone"
+                android:textSize="@dimen/font_size_13"
+                android:background="@drawable/shape_time_bu_bg"
+                />
+
+        </LinearLayout>
+        <LinearLayout
+
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d30"
+            android:layout_marginTop="@dimen/d100"
+            android:orientation="vertical">
+            <LinearLayout
+                android:id="@+id/time_ll_2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@mipmap/daojishi_wu"
+                android:layout_gravity="center"
+                android:gravity="center_horizontal"
+                >
+
+                <TextView
+                    android:id="@+id/time_ll2_tx_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d89"
+                    android:text="倒计时中"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_12"
+                    />
+                <TextView
+                    android:id="@+id/time_ll2_tx_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d20"
+                    android:text="00:00:00"
+                    android:textColor="#5F759B"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/font_size_28"
+                    />
+
+                <TextView
+                    android:id="@+id/time_ll2_bt_1"
+                    android:layout_width="@dimen/d125"
+                    android:layout_height="@dimen/d33"
+                    android:layout_marginTop="@dimen/d28"
+                    android:text="添加倒计时"
+
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:gravity="center"
+                    android:textStyle="bold"
+                    android:clickable="true"
+                    android:textSize="@dimen/font_size_13"
+                    android:background="@drawable/shape_time_ll_name_bg"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/time_ll2_bt_2"
+                android:layout_width="@dimen/d125"
+                android:layout_height="@dimen/d33"
+                android:text="关闭该倒计时"
+                android:textColor="@color/delete_text_color"
+                android:gravity="center"
+
+                android:visibility="gone"
+                android:layout_gravity="center"
+                android:textStyle="bold"
+                android:textSize="@dimen/font_size_13"
+                android:background="@drawable/shape_time_bu_bg"
+                />
+        </LinearLayout>
+
+
+        <LinearLayout
+
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d30"
+            android:layout_marginTop="@dimen/d100"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/time_ll_3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@mipmap/daojishi_wu"
+                android:layout_gravity="center"
+                android:gravity="center_horizontal"
+                >
+
+                <TextView
+                    android:id="@+id/time_ll3_tx_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d89"
+                    android:text="倒计时中"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_12"
+                    />
+                <TextView
+                    android:id="@+id/time_ll3_tx_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d20"
+                    android:text="00:00:00"
+                    android:textColor="#5F759B"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/font_size_28"
+                    />
+
+                <TextView
+                    android:id="@+id/time_ll3_bt_1"
+                    android:layout_width="@dimen/d125"
+                    android:layout_height="@dimen/d33"
+                    android:layout_marginTop="@dimen/d28"
+                    android:text="添加倒计时"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:gravity="center"
+                    android:textStyle="bold"
+                    android:clickable="true"
+                    android:textSize="@dimen/font_size_13"
+                    android:background="@drawable/shape_time_ll_name_bg"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/time_ll3_bt_2"
+                android:layout_width="@dimen/d125"
+                android:layout_height="@dimen/d33"
+                android:text="关闭该倒计时"
+                android:textColor="@color/delete_text_color"
+                android:gravity="center"
+
+                android:layout_gravity="center"
+                android:textStyle="bold"
+                android:textSize="@dimen/font_size_13"
+                android:visibility="gone"
+                android:background="@drawable/shape_time_bu_bg"
+                />
+        </LinearLayout>
+
+
+
+    </LinearLayout>
+
+
+
+
+    </LinearLayout>
+
+</layout>

+ 89 - 0
android_bed/src/main/res/layout-land/activity_sign.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="#EAF2F9"
+        >
+
+        <include
+            android:id="@+id/activity_layout_title"
+            layout="@layout/view_title_layout" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d80"
+            android:layout_marginTop="@dimen/d23"
+            android:layout_marginLeft="@dimen/d20"
+            android:orientation="horizontal"
+            >
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="72dp"
+                android:layout_weight="0.8"
+                android:orientation="horizontal"
+                android:background="@drawable/shape_bed_bg"
+                >
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_sign_main_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/d6"
+                    android:layout_marginRight="@dimen/d6"
+                    android:layout_marginTop="@dimen/d15"
+                    android:layout_marginBottom="@dimen/d15"
+
+                   />
+            </LinearLayout>
+
+
+
+            <LinearLayout
+                android:layout_width="240dp"
+                android:layout_height="72dp"
+                android:orientation="horizontal"
+                android:layout_marginLeft="@dimen/d10"
+                android:layout_marginRight="@dimen/d10"
+                android:gravity="center"
+                android:background="@drawable/shape_bed_bg"
+                >
+                <Button
+                    android:id="@+id/sign_previous_button"
+                    android:layout_width="@dimen/d92"
+                    android:layout_height="@dimen/d35"
+                    android:gravity="center"
+                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:text="曲线图"
+                    android:textSize="16sp"
+                    android:textColor="@color/white"/>
+                <Button
+                    android:id="@+id/sign_next_button"
+                    android:layout_width="@dimen/d92"
+                    android:layout_height="@dimen/d35"
+                    android:gravity="center"
+                    android:text="数据列表"
+                    android:background="@android:color/transparent"
+                    android:textSize="16sp"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textColor="@color/black"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/activity_sign"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/d15"
+            android:layout_marginLeft="@dimen/d20"
+            android:layout_marginRight="@dimen/d10"
+            android:layout_marginBottom="@dimen/d20"
+            android:background="@drawable/shape_bed_bg"
+            />
+
+    </LinearLayout>
+
+</layout>

+ 80 - 0
android_bed/src/main/res/layout-land/adapter_call_records_item.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="300dp"
+        android:layout_height="70dp"
+        android:background="#ffffff"
+        android:layout_marginTop="10dp">
+
+        <ImageView
+            android:id="@+id/tab_imagev"
+            android:layout_width="@dimen/d39"
+            android:layout_height="@dimen/d39"
+            android:layout_marginLeft="@dimen/d11"
+            android:layout_centerVertical="true"
+            android:src="@mipmap/ic_customer" />
+        <TextView
+            android:id="@+id/call_records_item_title"
+            android:layout_width="wrap_content"
+            android:layout_toRightOf="@+id/tab_imagev"
+            android:layout_height="wrap_content"
+            android:text="输液-事件呼叫"
+            android:textStyle="bold"
+            android:textColor="@color/black"
+            android:textSize="@dimen/font_size_14"
+            android:layout_marginLeft="@dimen/d5"
+            android:layout_marginTop="@dimen/d15"
+            />
+
+        <TextView
+            android:id="@+id/call_records_item_time"
+            android:layout_width="wrap_content"
+            android:layout_toRightOf="@+id/tab_imagev"
+            android:layout_height="wrap_content"
+            android:text="2023/05/04 14:04"
+            android:layout_below="@+id/call_records_item_title"
+            android:textColor="@color/about_text_color"
+            android:textSize="@dimen/font_size_12"
+            android:layout_marginLeft="@dimen/d5"
+            android:layout_marginTop="@dimen/d4"
+            />
+
+        <TextView
+            android:id="@+id/call_records_item_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="已响应"
+            android:textColor="@color/about_text_color"
+            android:textSize="@dimen/font_size_12"
+            android:layout_marginTop="@dimen/d15"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="@dimen/d10"
+            />
+        <TextView
+        android:id="@+id/call_records_item_call"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="已响应"
+        android:layout_below="@+id/call_records_item_type"
+        android:textColor="@color/white"
+        android:textSize="@dimen/font_size_9"
+        android:padding="@dimen/d5"
+        android:clickable="true"
+        android:layout_marginTop="@dimen/d4"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="@dimen/d10"
+        />
+        <ImageView
+            android:id="@+id/btn_call_accept"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:padding="4dp"
+            android:clickable="true"
+            android:layout_centerInParent="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="@dimen/d10"
+            android:visibility="gone"
+            android:src="@drawable/ic_answer_normal" />
+    </RelativeLayout>
+</layout>

+ 37 - 0
android_bed/src/main/res/layout-land/adapter_shijian_records_item.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/sj_view"
+        android:layout_width="142dp"
+        android:layout_height="70dp"
+        android:background="#ffffff"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:clickable="true"
+        android:layout_marginBottom="@dimen/d10"
+        >
+
+        <ImageView
+            android:id="@+id/sj_img"
+            android:layout_width="@dimen/d39"
+            android:layout_height="@dimen/d39"
+            android:layout_marginLeft="@dimen/d17"
+            android:layout_centerVertical="true"
+            android:src="@mipmap/yaoshui" />
+
+        <TextView
+            android:id="@+id/sj_records_item_title"
+            android:layout_width="wrap_content"
+            android:layout_toRightOf="@+id/tab_imagev"
+            android:layout_height="wrap_content"
+            android:text="换药水"
+            android:textStyle="bold"
+            android:layout_marginLeft="@dimen/d14"
+            android:textColor="@color/black"
+            android:textSize="@dimen/font_size_14"
+
+            />
+
+    </LinearLayout>
+</layout>

+ 34 - 0
android_bed/src/main/res/layout-land/call.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextureView
+        android:id="@+id/videoSurface"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextureView
+        android:id="@+id/videoCaptureSurface"
+        android:layout_width="300dp"
+        android:layout_height="200dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true" />
+
+    <Button
+        android:id="@+id/toggle_speaker"
+        android:text="切换外放"
+        android:layout_marginBottom="30dp"
+        android:layout_centerHorizontal="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <Button
+        android:id="@+id/terminate_call"
+        android:text="挂断"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</RelativeLayout>

+ 270 - 0
android_bed/src/main/res/layout-land/callingbed_activation.xml

@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#F8FAFE">
+
+        <ImageView
+            android:id="@+id/activation_img"
+            android:layout_width="@dimen/d637"
+            android:layout_height="match_parent"
+            android:background="@mipmap/activation_bg"
+            />
+        <TextView
+            android:id="@+id/activation_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="请先激活设备"
+            android:textStyle="bold"
+            android:textSize="@dimen/font_size_32"
+            android:textColor="@color/white"
+            android:layout_marginTop="@dimen/d98"
+            android:layout_marginLeft="@dimen/d100"
+            />
+        <TextView
+            android:id="@+id/activation_title_msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="设置右侧参数后激活"
+            android:textSize="@dimen/font_size_16"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            android:layout_marginTop="@dimen/d144"
+            android:layout_marginLeft="@dimen/d100"
+            />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:background="@drawable/shape_bed_bg"
+            android:layout_marginTop="@dimen/d10"
+            android:layout_marginLeft="@dimen/d610"
+            android:layout_marginRight="@dimen/d24"
+            android:layout_marginBottom="@dimen/d10">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="智能健康 关爱互联系统"
+                    android:textSize="@dimen/font_size_20"
+                    android:textColor="@color/black"
+                    android:layout_marginTop="@dimen/d15" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="扫描二维码进行激活"
+                    android:textSize="@dimen/font_size_13"
+                    android:textColor="@color/black"
+                    android:layout_marginTop="@dimen/d5" />
+
+                <ImageView
+                    android:id="@+id/activation_qr_code"
+                    android:layout_width="@dimen/d200"
+                    android:layout_height="@dimen/d200" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="@dimen/d2"
+                    android:layout_marginLeft="@dimen/d90">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="当前版本号:"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/black"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/activation_v"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="V--"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/txt_setting" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginLeft="@dimen/d108"
+                    android:layout_marginTop="@dimen/d10">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="本机IP:"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/black"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/activation_ip"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/txt_setting" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginLeft="@dimen/d116"
+                    android:layout_marginTop="@dimen/d10">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="网关:"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/black"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/activation_wg"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/txt_setting" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginLeft="@dimen/d116"
+                    android:layout_marginTop="@dimen/d10">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="掩码:"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/black"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/activation_ym"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/txt_setting" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginLeft="@dimen/d108"
+                    android:layout_marginTop="@dimen/d10">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="注册码:"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/black"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/activation_zcm"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/txt_setting" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginLeft="@dimen/d100"
+                    android:layout_marginTop="@dimen/d10">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="服务器IP:"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/black"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/activation_fuq"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/txt_setting" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d48"
+                    android:layout_marginTop="@dimen/d10"
+                    android:gravity="center_vertical"
+                    android:layout_marginLeft="@dimen/d19"
+                    android:layout_marginRight="@dimen/d19"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/activation_settings_button"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/d48"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:text="重启"
+                        android:textSize="16sp"
+                        android:textColor="@drawable/selector_bottom_btn_text_color" />
+
+                    <Button
+                        android:id="@+id/activation_system_button"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/d48"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:text="系统设置"
+                        android:textSize="16sp"
+                        android:layout_marginRight="@dimen/d14"
+                        android:layout_marginLeft="@dimen/d14"
+                        android:textColor="@drawable/selector_bottom_btn_text_color" />
+
+                    <Button
+                        android:id="@+id/activation_services_button"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/d48"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:text="服务器设置"
+                        android:textSize="16sp"
+                        android:textColor="@drawable/selector_bottom_btn_text_color" />
+                </LinearLayout>
+            </LinearLayout>
+
+
+    </RelativeLayout>
+</layout>
+

Dosya farkı çok büyük olduğundan ihmal edildi
+ 265 - 0
android_bed/src/main/res/layout-land/callingbed_department_info_main.xml


+ 166 - 0
android_bed/src/main/res/layout-land/callingbed_doctor_info_main.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#F7F7F7">
+
+     <LinearLayout
+         android:id="@+id/doctor_info_ll"
+         android:layout_width="match_parent"
+         android:layout_height="@dimen/d400"
+         android:background="@mipmap/info_bg"
+         android:orientation="vertical"
+         >
+
+         <include
+             android:id="@+id/activity_calling_bed_layout_title"
+             layout="@layout/view_title_layout"
+             />
+
+         <RelativeLayout
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+             <TextView
+                 android:id="@+id/doctor_info_name"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_marginTop="@dimen/d84"
+                 android:layout_marginLeft="@dimen/d73"
+                 android:text="张德怀"
+                 android:textColor="@color/white"
+                 android:textStyle="bold"
+                 android:textSize="@dimen/font_size_22"
+                  />
+             <TextView
+                 android:id="@+id/doctor_info_type"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_marginTop="@dimen/d84"
+                 android:layout_marginLeft="@dimen/d10"
+                 android:paddingRight="@dimen/d16"
+                 android:paddingLeft="@dimen/d16"
+                 android:paddingTop="@dimen/d6"
+                 android:paddingBottom="@dimen/d6"
+                 android:layout_toRightOf="@+id/doctor_info_name"
+                 android:text="骨科"
+                 android:background="@drawable/shape_info_txt_bg"
+                 android:textColor="@color/txt_number"
+                 android:textSize="@dimen/font_size_15"
+                 />
+             <TextView
+                 android:id="@+id/doctor_info_sex"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_marginTop="@dimen/d15"
+                 android:layout_marginLeft="@dimen/d73"
+                 android:paddingRight="@dimen/d16"
+                 android:paddingLeft="@dimen/d16"
+                 android:paddingTop="@dimen/d6"
+                 android:paddingBottom="@dimen/d6"
+                  android:layout_below="@+id/doctor_info_name"
+                 android:text="性别: 男"
+                 android:background="@drawable/shape_info_txt_bg2"
+                 android:textColor="@color/white"
+                 android:textSize="@dimen/font_size_15"
+                 />
+             <TextView
+                 android:id="@+id/doctor_info_age"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_marginTop="@dimen/d15"
+                 android:layout_marginLeft="@dimen/d12"
+                 android:paddingRight="@dimen/d16"
+                 android:paddingLeft="@dimen/d16"
+                 android:paddingTop="@dimen/d6"
+                 android:paddingBottom="@dimen/d6"
+                 android:layout_below="@+id/doctor_info_name"
+                 android:layout_toRightOf="@+id/doctor_info_sex"
+                 android:text="年龄: 58岁"
+                 android:background="@drawable/shape_info_txt_bg2"
+                 android:textColor="@color/white"
+                 android:textSize="@dimen/font_size_15"
+                 />
+             <TextView
+                 android:id="@+id/doctor_infoage"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_marginTop="@dimen/d15"
+                 android:layout_marginLeft="@dimen/d12"
+                 android:paddingRight="@dimen/d16"
+                 android:paddingLeft="@dimen/d16"
+                 android:paddingTop="@dimen/d6"
+                 android:paddingBottom="@dimen/d6"
+                 android:layout_below="@+id/doctor_info_name"
+                 android:layout_toRightOf="@+id/doctor_info_age"
+                 android:text="10年资深医师"
+                 android:background="@drawable/shape_info_txt_bg2"
+                 android:textColor="@color/white"
+                 android:textSize="@dimen/font_size_15"
+                 />
+             <ImageView
+                 android:layout_width="@dimen/d150"
+                 android:layout_height="@dimen/d150"
+                 android:src="@mipmap/yisheng"
+                 android:layout_alignParentRight="true"
+                 android:layout_marginTop="@dimen/d30"
+                 android:layout_marginRight="@dimen/d50"
+                 />
+         </RelativeLayout>
+
+
+     </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/shape_bed_bg"
+            android:layout_marginTop="@dimen/d250"
+            android:layout_marginRight="@dimen/d89"
+            android:layout_marginLeft="@dimen/d89"
+            >
+
+            <View
+                android:id="@+id/doctor_info_view"
+                android:layout_width="@dimen/d6"
+                android:layout_height="@dimen/d25"
+                android:layout_marginTop="@dimen/d29"
+                android:layout_marginLeft="@dimen/d28"
+                android:background="@drawable/shape_main_hos_txt_bg"
+                />
+
+            <TextView
+                android:id="@+id/doctor_info_txt_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d29"
+                android:layout_marginLeft="@dimen/d11"
+                android:layout_toRightOf="@+id/doctor_info_view"
+                android:text="医生介绍"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:textSize="@dimen/font_size_18"
+                />
+            <TextView
+                android:id="@+id/doctor_info_txt"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@+id/doctor_info_view"
+                android:layout_marginTop="@dimen/d18"
+                android:layout_marginLeft="@dimen/d28"
+                android:layout_marginRight="@dimen/d30"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:textSize="@dimen/font_size_18"
+
+                />
+        </RelativeLayout>
+
+
+
+
+
+    </RelativeLayout>
+
+</layout>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 278 - 0
android_bed/src/main/res/layout-land/callingbed_hospital_info_main.xml


+ 218 - 0
android_bed/src/main/res/layout-land/callingbed_main_mom.xml

@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/baby_bg"
+        android:orientation="vertical"
+        >
+
+        <RelativeLayout
+            android:id="@+id/mom_view_title_layout"
+            android:layout_width="match_parent"
+            android:layout_height="42dp"
+
+            >
+            <!--设备号-->
+            <LinearLayout
+                android:id="@+id/mom_view_title_layout_return"
+                android:layout_width="@dimen/d105"
+                android:layout_height="@dimen/d30"
+                android:layout_marginLeft="20dp"
+                android:background="@drawable/shape_time_bu_bg"
+                android:clickable="true"
+                android:gravity="center"
+                android:layout_centerVertical="true"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_img"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="6dp"
+                    android:visibility="gone"
+                    android:background="@mipmap/return_b" />
+                <!--医院名称-->
+                <TextView
+                    android:id="@+id/mom_view_title_layout_tv_hospital_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="科室名称"
+                    android:textColor="@color/title_text"
+                    android:textSize="@dimen/font_size_14" />
+            </LinearLayout>
+            <TextView
+                android:id="@+id/mom_view_title_layout_tv_no"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginRight="10dp"
+                android:text="ID:"
+                android:visibility="gone"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18" />
+            <!--状态图标-->
+            <LinearLayout
+                android:id="@+id/mom_view_title_layout_ll_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="@dimen/d22"
+                    android:layout_height="@dimen/d22"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:background="@mipmap/riqi_b" />
+                <!--日期-->
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:format12Hour="yyyy-MM-dd EEEE"
+                    android:format24Hour="yyyy-MM-dd EEEE"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/font_size_14"
+                    android:layout_marginLeft="@dimen/d5"
+                    android:text="16:08"/>
+
+                <ImageView
+                    android:layout_width="@dimen/d22"
+                    android:layout_height="@dimen/d22"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="@dimen/d23"
+                    android:layout_marginRight="4dp"
+                    android:background="@mipmap/shijian_b" />
+                <!--时间-->
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:format12Hour="HH:mm"
+                    android:format24Hour="HH:mm"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/font_size_14"
+                    android:layout_marginLeft="@dimen/d5"
+                    android:layout_marginRight="@dimen/d15"
+                    android:text="16:08"/>
+
+                <!--SIP状态图标-->
+                <TextView
+                    android:id="@+id/mom_view_title_layout_tv_point"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:visibility="gone"
+                    android:background="@mipmap/sip_b"/>
+
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_iv_bt"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:visibility="gone"/>
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_iv_wifi"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:visibility="gone"/>
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_iv_tcp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:src="@mipmap/ic_tcp_fail"/>
+
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_iv_ethernet"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:src="@mipmap/ic_ethernet_success_w"
+                    />
+
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_iv_day_night"
+                    android:layout_width="20dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:src="@mipmap/ic_daylight_w" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/mom_mian_bt_ll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/d35"
+            android:layout_below="@+id/mom_view_title_layout"
+            android:gravity="center"
+            >
+
+            <TextView
+                android:id="@+id/mom_mian_sy_bt"
+                android:layout_width="@dimen/d230"
+                android:layout_height="@dimen/d60"
+                android:text="首页"
+                android:textStyle="bold"
+                android:textColor="@color/white"
+                android:textSize="32sp"
+                android:gravity="center"
+                android:background="@drawable/shape_baby_bg_title"
+                android:layout_centerHorizontal="true"
+                android:layout_marginRight="@dimen/d8"
+                />
+            <TextView
+                android:id="@+id/mom_mian_tx_bt"
+                android:layout_width="@dimen/d230"
+                android:layout_height="@dimen/d60"
+                android:text="通讯列表"
+                android:textStyle="bold"
+                android:textColor="@color/white"
+                android:textSize="32sp"
+                android:gravity="center"
+                android:background="@drawable/shape_baby_bg_title2"
+                android:layout_centerHorizontal="true"
+                android:layout_marginLeft="@dimen/d8"
+
+                />
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/callingbed_main_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/mom_mian_bt_ll"
+            android:layout_marginBottom="10dp"
+            />
+        <!--通话界面-->
+        <FrameLayout
+            android:id="@+id/bed_call_frame_new"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            />
+    </RelativeLayout>
+</layout>

+ 509 - 0
android_bed/src/main/res/layout-land/callingbed_main_new.xml

@@ -0,0 +1,509 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <FrameLayout
+            android:id="@+id/bed_call_frame_r_h"
+            android:layout_width="310dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/calling_bed_layout_hl_title"
+            android:layout_marginBottom="@dimen/d20"
+            android:layout_marginTop="@dimen/d8" />
+
+        <!--通话界面-->
+        <FrameLayout
+            android:id="@+id/bed_call_frame_new"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+
+        <!--通话记录界面-->
+        <FrameLayout
+            android:id="@+id/bed_call_frame_r"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <RelativeLayout
+            android:id="@+id/main_rl_1"
+            android:layout_width="120dp"
+            android:layout_height="match_parent"
+            android:background="@mipmap/bg"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/menu_home"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d15"
+                android:layout_marginTop="18dp"
+                android:layout_marginRight="@dimen/d15"
+                android:background="@drawable/shape_main_bt_bg"
+                android:clickable="true"
+                android:drawablePadding="6dp"
+                android:ellipsize="end"
+                android:focusableInTouchMode="true"
+                android:gravity="center"
+                android:padding="10dp"
+                android:singleLine="true"
+                android:text="@string/str_home"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/menu_medical_care"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/menu_home"
+                android:layout_marginLeft="@dimen/d15"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="@dimen/d15"
+                android:background="@drawable/shape_main_bt_bg"
+                android:clickable="true"
+                android:drawablePadding="6dp"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:padding="10dp"
+                android:singleLine="true"
+                android:text="@string/str_medical_care"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/menu_more"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/menu_medical_care"
+                android:layout_marginLeft="@dimen/d15"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="@dimen/d15"
+                android:background="@drawable/shape_main_bt_bg"
+                android:clickable="true"
+                android:drawablePadding="6dp"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:padding="10dp"
+                android:singleLine="true"
+                android:text="@string/str_more"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+
+            <LinearLayout
+                android:id="@+id/main_time_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/menu_more"
+                android:layout_marginLeft="@dimen/d20"
+                android:layout_marginTop="@dimen/d20"
+                android:layout_marginRight="@dimen/d10"
+                android:background="@drawable/shape_bed_bg"
+                android:clickable="true"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/main_time_tx_1"
+                    android:layout_width="@dimen/d63"
+                    android:layout_height="@dimen/d20"
+                    android:layout_marginTop="@dimen/d10"
+                    android:background="@drawable/shape_time_ll_name_bg"
+                    android:gravity="center"
+                    android:text="添加倒计时"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="@dimen/font_size_12"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/main_time_tx_2"
+                    android:layout_width="@dimen/d63"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d8"
+                    android:gravity="center"
+                    android:text="00:00:00"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_12"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/main_time_tx_3"
+                    android:layout_width="@dimen/d63"
+                    android:layout_height="@dimen/d20"
+                    android:layout_marginTop="@dimen/d10"
+                    android:background="@drawable/shape_time_ll_name_bg"
+                    android:gravity="center"
+                    android:text="添加倒计时"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="@dimen/font_size_12"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/main_time_tx_4"
+                    android:layout_width="@dimen/d63"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d8"
+                    android:gravity="center"
+                    android:text="00:00:00"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_12"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/main_time_tx_5"
+                    android:layout_width="@dimen/d63"
+                    android:layout_height="@dimen/d20"
+                    android:layout_marginTop="@dimen/d10"
+                    android:background="@drawable/shape_time_ll_name_bg"
+                    android:gravity="center"
+                    android:text="添加倒计时"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="@dimen/font_size_12"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/main_time_tx_6"
+                    android:layout_width="@dimen/d63"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d8"
+                    android:layout_marginBottom="@dimen/d10"
+                    android:gravity="center"
+                    android:text="00:00:00"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_12"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+
+            <TextView
+                android:id="@+id/menu_support"
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_above="@+id/menu_call_nurse"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:background="@drawable/selector_zengyuan_bt"
+                android:clickable="true"
+                android:drawableTop="@mipmap/zengyuan"
+                android:gravity="center"
+                android:padding="20dp"
+                android:text="@string/str_supports"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/menu_call_nurse"
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_alignParentBottom="true"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="@dimen/d20"
+                android:background="@drawable/selector_callhu_bt"
+                android:clickable="true"
+                android:drawableTop="@mipmap/hujiao"
+                android:gravity="center"
+                android:paddingTop="@dimen/d20"
+                android:paddingBottom="@dimen/d20"
+                android:text="@string/str_call_nurse"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/calling_bed_layout_hl_title"
+            android:layout_width="match_parent"
+            android:background="@color/huli_bg"
+            android:visibility="gone"
+            android:layout_height="42dp">
+
+            <!--设备号-->
+            <LinearLayout
+                android:id="@+id/title_layout_hl_return"
+                android:layout_width="@dimen/d105"
+                android:layout_height="@dimen/d30"
+                android:layout_marginLeft="20dp"
+                android:background="@drawable/shape_bed_bg"
+                android:clickable="true"
+                android:gravity="center"
+                android:layout_centerVertical="true"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/title_layout_hl_img"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="6dp"
+                    android:background="@mipmap/rturn_f" />
+                <!--医院名称-->
+                <TextView
+                    android:id="@+id/title_layout_tv_hospital_hl_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="退出护理"
+                    android:textColor="#FF8484"
+                    android:textSize="@dimen/font_size_14" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/title_layout_tv_no_hl_img"
+                android:layout_width="@dimen/d22"
+                android:layout_height="@dimen/d22"
+                android:layout_centerVertical="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginRight="10dp"
+                android:layout_toLeftOf="@+id/title_layout_tv_hl_no"
+                android:background="@mipmap/dun" />
+            <TextView
+                android:id="@+id/title_layout_tv_hl_no"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginRight="10dp"
+                android:text="护理中"
+                android:textColor="@color/white"
+                android:textSize="@dimen/font_size_18" />
+
+            <!--状态图标-->
+            <LinearLayout
+                android:id="@+id/title_layout_ll_hl_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="@dimen/d22"
+                    android:layout_height="@dimen/d22"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:background="@mipmap/riqi_b" />
+                <!--日期-->
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:format12Hour="yyyy-MM-dd EEEE"
+                    android:format24Hour="yyyy-MM-dd EEEE"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/font_size_16"
+                    android:layout_marginLeft="@dimen/d5"
+                    android:text="16:08"/>
+
+                <ImageView
+                    android:layout_width="@dimen/d22"
+                    android:layout_height="@dimen/d22"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="@dimen/d23"
+                    android:layout_marginRight="4dp"
+                    android:background="@mipmap/shijian_b" />
+                <!--时间-->
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:format12Hour="HH:mm"
+                    android:format24Hour="HH:mm"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/font_size_16"
+                    android:layout_marginLeft="@dimen/d5"
+                    android:layout_marginRight="@dimen/d30"
+                    android:text="16:08"/>
+
+                <!--SIP状态图标-->
+                <TextView
+                    android:id="@+id/title_layout_tv_hl_point"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:visibility="gone"
+                    android:background="@mipmap/sip_b"/>
+
+                <ImageView
+                    android:id="@+id/title_layout_iv_hl_bt"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:visibility="gone"/>
+                <ImageView
+                    android:id="@+id/title_layout_iv_hl_wifi"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:visibility="gone"/>
+                <ImageView
+                    android:id="@+id/title_layout_iv_hl_tcp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:src="@mipmap/ic_tcp_fail"/>
+
+                <ImageView
+                    android:id="@+id/title_layout_iv_hl_ethernet"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:visibility="gone"/>
+
+                <ImageView
+                    android:id="@+id/title_layout_iv_day_hl_night"
+                    android:layout_width="20dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:src="@mipmap/ic_daylight" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/main_rl_2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@+id/main_rl_1"
+            android:layout_below="@+id/calling_bed_layout_hl_title"
+            android:background="#EAF2F9">
+            <include
+                android:id="@+id/activity_calling_bed_layout_title_new"
+                layout="@layout/view_title_layout" />
+
+            <!--床位fragment区域-->
+            <FrameLayout
+                android:id="@+id/callingbed_main_frame"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@id/activity_calling_bed_layout_title_new"
+                android:layout_marginBottom="10dp"
+                android:layout_marginLeft="20dp" />
+
+            <LinearLayout
+                android:id="@+id/ll_broadcast_view_new"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_marginBottom="20dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="210dp"
+                android:gravity="center"
+                android:layout_centerInParent="true"
+                android:background="@color/trans_bg_color"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/str_volume"
+                    android:textSize="20sp"
+                    android:textColor="@color/title_text"/>
+
+                <SeekBar
+                    android:id="@+id/seekbar_bc_volume_new"
+                    android:layout_width="180dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:max="100"
+                    android:progress="0"
+                    android:maxHeight="5dp"
+                    android:progressDrawable="@drawable/po_seekbar"
+                    android:thumb="@drawable/seekbar_thumb"/>
+
+                <TextView
+                    android:id="@+id/tv_broadcast_state_new"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/ic_baseline_pause"/>
+
+                <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+                    android:id="@+id/tv_broadcast_text_new"
+                    android:layout_width="160dp"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:marqueeRepeatLimit="-1"
+                    android:singleLine="true"
+                    android:text="@string/broadcast_playing"
+                    android:textSize="32sp"
+                    android:textColor="@color/title_text"/>
+
+                <TextView
+                    android:id="@+id/tv_broadcast_stop_new"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/ic_baseline_cancel"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/main_rl_3"
+                android:layout_width="@dimen/d48"
+                android:layout_height="match_parent"
+                android:background="@drawable/shape_main_call_r_bg"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/activity_calling_bed_layout_title_new"
+                android:gravity="center_horizontal"
+                android:clickable="true"
+                android:orientation="vertical">
+                <ImageView
+                    android:layout_width="@dimen/d24"
+                    android:layout_height="@dimen/d24"
+                    android:layout_marginTop="@dimen/d16"
+                    android:src="@mipmap/zhankai"/>
+
+                <TextView
+                    android:layout_width="18dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d10"
+                    android:text="展开列表"
+                    android:textColor="@color/black"
+                    android:textSize="18sp" />
+                <LinearLayout
+                    android:layout_width="@dimen/d20"
+                    android:layout_height="@dimen/d58"
+                    android:background="@drawable/shape_main_call_r_wj_bg"
+                    android:orientation="vertical"
+                    android:gravity="center"
+                    android:visibility="gone"
+                    android:layout_marginTop="@dimen/d10"
+                    >
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@mipmap/weijie"
+                        android:gravity="center"
+                        android:text="未接30"
+                        android:textColor="@color/white"
+                        android:textSize="10sp" />
+                </LinearLayout>
+            </LinearLayout>
+        </RelativeLayout>
+
+
+    </RelativeLayout>
+</layout>

+ 240 - 0
android_bed/src/main/res/layout-land/callingbed_nurse.xml

@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="#EAF2F9">
+
+          <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="@dimen/d80"
+                 android:gravity="center_vertical"
+                 android:background="@drawable/shape_bed_bg"
+                 android:layout_marginTop="@dimen/d20"
+                 android:layout_marginLeft="@dimen/d24"
+                 android:layout_marginRight="@dimen/d24"
+                 >
+                 <ImageView
+                     android:layout_width="40dp"
+                     android:layout_height="40dp"
+                     android:src="@mipmap/yanz"
+                     android:layout_marginLeft="25dp"
+                     />
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="选择一种方式验证进入医护功能"
+                     android:layout_marginLeft="@dimen/d20"
+                     android:textSize="@dimen/font_size_18"
+                     android:textColor="@color/black"
+                     android:textStyle="bold"
+                     />
+
+             </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/d410"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginTop="@dimen/d20"
+        android:layout_marginLeft="@dimen/d24"
+        android:layout_marginRight="@dimen/d24"
+        android:layout_marginBottom="@dimen/d20"
+        >
+        <LinearLayout
+            android:id="@+id/rv_nurse_main_ll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/d28"
+            android:visibility="gone"
+            android:background="@drawable/shape_bed_bg"
+            android:orientation="vertical">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_nurse_main_view"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d250"
+                android:layout_marginLeft="@dimen/d6"
+                android:layout_marginRight="@dimen/d6"
+                android:layout_marginTop="@dimen/d15"
+                android:layout_marginBottom="@dimen/d15"
+                />
+
+            <TextView
+                android:id="@+id/nurse_bt_1"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d50"
+                android:layout_marginLeft="@dimen/d40"
+                android:layout_marginRight="@dimen/d50"
+                android:layout_marginTop="@dimen/d20"
+                android:background="@drawable/selector_nuserlogin_btn"
+                android:gravity="center"
+                android:clickable="true"
+                android:text="进入医护"
+                android:textColor="@color/white"
+                android:textSize="@dimen/font_size_15" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="@dimen/d10"
+            android:layout_weight="1"
+            android:background="@drawable/shape_bed_bg"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="@dimen/d75"
+                android:layout_height="@dimen/d75"
+                android:layout_marginTop="@dimen/d22"
+                android:src="@mipmap/yan" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d22"
+                android:text="输入您的密码进入医护"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_15"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d8"
+                android:text="密码由数字组成"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_10" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d50"
+                android:layout_marginTop="@dimen/d16"
+                android:gravity="center_vertical"
+                android:visibility="gone"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d40"
+                    android:text="工号"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_15"
+                    android:textStyle="bold" />
+
+                <EditText
+                    android:id="@+id/nurse_login_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/d8"
+                    android:layout_marginRight="@dimen/d60"
+                    android:background="@drawable/selector_nuser_ed_d"
+                    android:hint="请输入工号"
+                    android:paddingLeft="@dimen/d26"
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold"
+
+                    />
+
+
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d50"
+                android:layout_marginTop="@dimen/d28"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d40"
+                    android:text="密码"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_15"
+                    android:textStyle="bold"
+
+                    />
+                <EditText
+                    android:id="@+id/nurse_login_nuber"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/d8"
+                    android:layout_marginRight="@dimen/d60"
+                    android:background="@drawable/selector_nuser_ed_d"
+                    android:hint="请输入密码"
+                    android:paddingLeft="@dimen/d26"
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
+
+
+
+            </LinearLayout>
+
+
+
+            <TextView
+                android:id="@+id/nurse_bt"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d50"
+                android:layout_marginLeft="@dimen/d40"
+                android:layout_marginRight="@dimen/d50"
+                android:layout_marginTop="@dimen/d20"
+                android:background="@drawable/selector_nuserlogin_btn"
+                android:gravity="center"
+                android:clickable="true"
+                android:text="进入医护"
+                android:textColor="@color/white"
+                android:textSize="@dimen/font_size_15" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/d10"
+            android:background="@drawable/shape_bed_bg"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="请在旁边刷卡处刷NFC卡进入医护"
+                android:layout_marginLeft="@dimen/d20"
+                android:textSize="@dimen/font_size_18"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:layout_marginTop="@dimen/d47"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="使用有效NFC刷卡成功后直接进入医护"
+                android:textSize="@dimen/font_size_10"
+                android:textColor="@color/black"
+                android:layout_marginTop="@dimen/d13"
+                />
+            <ImageView
+                android:layout_width="@dimen/d244"
+                android:layout_height="@dimen/d280"
+                android:src="@mipmap/nfc"
+                android:layout_marginTop="@dimen/d20"
+                />
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+    </LinearLayout>
+
+</layout>

+ 250 - 0
android_bed/src/main/res/layout-land/callingbed_nurse_main.xml

@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="#EAF2F9">
+
+          <RelativeLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="@dimen/d220"
+                 android:background="@drawable/shape_bed_bg"
+                 android:layout_marginTop="@dimen/d20"
+                 android:layout_marginLeft="@dimen/d20"
+                 android:layout_marginRight="@dimen/d20"
+                 >
+              <TextView
+                  android:id="@+id/nurse_main_tx_1"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:text="您好,"
+                  android:textSize="@dimen/font_size_26"
+                  android:textColor="@color/txt_number"
+                  android:textStyle="bold"
+                  android:layout_marginTop="@dimen/d40"
+                  android:layout_marginLeft="@dimen/d40"
+                  />
+              <TextView
+                  android:id="@+id/nurse_main_tx_name"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:text="张舒婷护士"
+                  android:textSize="@dimen/font_size_26"
+                  android:textColor="@color/black"
+                  android:layout_toRightOf="@+id/nurse_main_tx_1"
+                  android:textStyle="bold"
+                  android:layout_marginTop="@dimen/d40"
+                  />
+              <TextView
+                  android:id="@+id/nurse_main_tx_2"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:text="当前为您的个人医护板块"
+                  android:textSize="@dimen/font_size_18"
+                  android:textColor="@color/text_black"
+                  android:layout_below="@+id/nurse_main_tx_1"
+                  android:textStyle="bold"
+                  android:layout_marginLeft="@dimen/d40"
+                  android:layout_marginTop="@dimen/d8"
+                  />
+              <TextView
+                  android:id="@+id/nurse_main_bt"
+                  android:layout_height="@dimen/d37"
+                  android:layout_width="@dimen/d110"
+                  android:gravity="center"
+                  android:layout_below="@+id/nurse_main_tx_2"
+                  android:layout_marginTop="@dimen/d30"
+                  android:layout_marginLeft="@dimen/d40"
+                  android:layout_marginRight="@dimen/d50"
+                  android:text="退出医护"
+                  android:clickable="true"
+                  android:textSize="@dimen/font_size_15"
+                  android:textColor="@color/white"
+                  android:background="@drawable/selector_nuserlogin_btn"
+                  />
+
+                 <ImageView
+                     android:layout_width="@dimen/d365"
+                     android:layout_height="match_parent"
+                     android:layout_alignParentRight="true"
+                     android:layout_marginLeft="25dp"
+                     android:src="@mipmap/yihu"
+                     />
+
+          </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginTop="@dimen/d20"
+        android:layout_marginLeft="@dimen/d24"
+        android:layout_marginRight="@dimen/d24"
+        android:layout_marginBottom="@dimen/d20"
+        >
+        <LinearLayout
+            android:id="@+id/nurse_main_1_ll"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:background="@drawable/shape_bed_bg"
+            android:layout_marginRight="@dimen/d10"
+            >
+            <ImageView
+                android:id="@+id/nurse_main_1_img"
+                android:layout_width="@dimen/d95"
+                android:layout_height="@dimen/d95"
+                android:src="@mipmap/ding"
+                android:layout_marginTop="@dimen/d22"
+                />
+
+            <TextView
+                android:id="@+id/nurse_top_1_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="定位"
+                android:textSize="@dimen/font_size_24"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:layout_marginTop="@dimen/d32"
+                />
+
+            <TextView
+                android:id="@+id/nurse_main_1_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="住院部402房"
+                android:textSize="@dimen/font_size_18"
+                android:textColor="@color/text_name_color"
+                android:layout_marginTop="@dimen/d10"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/nurse_main_2_ll"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:background="@drawable/shape_bed_bg"
+            android:layout_marginRight="@dimen/d10"
+            >
+            <ImageView
+                android:id="@+id/nurse_main_2_img"
+                android:layout_width="@dimen/d95"
+                android:layout_height="@dimen/d95"
+                android:src="@mipmap/xun"
+                android:layout_marginTop="@dimen/d22"
+                />
+
+            <TextView
+                android:id="@+id/nurse_top_2_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="巡房"
+                android:textSize="@dimen/font_size_24"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:layout_marginTop="@dimen/d32"
+                />
+
+            <TextView
+                android:id="@+id/nurse_main_2_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="住院部402房"
+                android:textSize="@dimen/font_size_18"
+                android:textColor="@color/text_name_color"
+                android:layout_marginTop="@dimen/d10"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/nurse_main_3_ll"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:background="@drawable/shape_bed_bg"
+            android:layout_marginRight="@dimen/d10"
+            >
+            <ImageView
+                android:id="@+id/nurse_main_3_img"
+                android:layout_width="@dimen/d95"
+                android:layout_height="@dimen/d95"
+                android:src="@mipmap/hu"
+                android:layout_marginTop="@dimen/d22"
+                />
+
+            <TextView
+                android:id="@+id/nurse_top_3_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="进入护理"
+                android:textSize="@dimen/font_size_24"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:layout_marginTop="@dimen/d32"
+                />
+
+            <TextView
+                android:id="@+id/nurse_main_3_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="该房病床进入护理"
+                android:textSize="@dimen/font_size_18"
+                android:textColor="@color/text_name_color"
+                android:layout_marginTop="@dimen/d10"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/nurse_main_4_ll"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:background="@drawable/shape_bed_bg"
+            android:layout_marginRight="@dimen/d10"
+            >
+            <ImageView
+                android:id="@+id/nurse_main_4_img"
+                android:layout_width="@dimen/d95"
+                android:layout_height="@dimen/d95"
+                android:src="@mipmap/tishi"
+                android:layout_marginTop="@dimen/d22"
+                />
+
+            <TextView
+                android:id="@+id/nurse_top_4_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="设置提示语"
+                android:textSize="@dimen/font_size_24"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:layout_marginTop="@dimen/d32"
+                />
+
+            <TextView
+                android:id="@+id/nurse_main_4_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="锁屏显示"
+                android:textSize="@dimen/font_size_18"
+                android:textColor="@color/text_name_color"
+                android:layout_marginTop="@dimen/d10"
+                />
+        </LinearLayout>
+    </LinearLayout>
+
+    </LinearLayout>
+</layout>

+ 528 - 0
android_bed/src/main/res/layout-land/callingbed_nurse_msg.xml

@@ -0,0 +1,528 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="#F7F7F7">
+        <RelativeLayout
+            android:id="@+id/msg_ll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#3A78EF"
+            android:visibility="gone"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="42dp"
+
+                >
+                <!--设备号-->
+                <LinearLayout
+                    android:id="@+id/msg_view_title_layout_return"
+                    android:layout_width="@dimen/d105"
+                    android:layout_height="@dimen/d30"
+                    android:layout_marginLeft="20dp"
+                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:layout_centerVertical="true"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/msg_view_title_layout_img"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="6dp"
+                        android:visibility="gone"
+                        android:background="@mipmap/return_w" />
+                    <!--医院名称-->
+                    <TextView
+                        android:id="@+id/msg_view_title_layout_tv_hospital_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="科室名称"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+                <TextView
+                    android:id="@+id/msg_view_title_layout_tv_no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginRight="10dp"
+                    android:text="ID:"
+                    android:visibility="gone"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_18" />
+                <!--状态图标-->
+                <LinearLayout
+                    android:id="@+id/msg_view_title_layout_ll_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="@dimen/d22"
+                        android:layout_height="@dimen/d22"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:background="@mipmap/riqi_b" />
+                    <!--日期-->
+                    <TextClock
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:format12Hour="yyyy-MM-dd EEEE"
+                        android:format24Hour="yyyy-MM-dd EEEE"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/font_size_14"
+                        android:layout_marginLeft="@dimen/d5"
+                        android:text="16:08"/>
+
+                    <ImageView
+                        android:layout_width="@dimen/d22"
+                        android:layout_height="@dimen/d22"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="@dimen/d23"
+                        android:layout_marginRight="4dp"
+                        android:background="@mipmap/shijian_b" />
+                    <!--时间-->
+                    <TextClock
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:format12Hour="HH:mm"
+                        android:format24Hour="HH:mm"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/font_size_14"
+                        android:layout_marginLeft="@dimen/d5"
+                        android:layout_marginRight="@dimen/d15"
+                        android:text="16:08"/>
+
+                    <!--SIP状态图标-->
+                    <TextView
+                        android:id="@+id/msg_view_title_layout_tv_point"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:visibility="gone"
+                        android:background="@mipmap/sip_b"/>
+
+                    <ImageView
+                        android:id="@+id/msg_view_title_layout_iv_bt"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:visibility="gone"/>
+                    <ImageView
+                        android:id="@+id/msg_view_title_layout_iv_wifi"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:visibility="gone"/>
+                    <ImageView
+                        android:id="@+id/msg_view_title_layout_iv_tcp"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:src="@mipmap/ic_tcp_fail"/>
+
+                    <ImageView
+                        android:id="@+id/msg_view_title_layout_iv_ethernet"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:src="@mipmap/ic_ethernet_success_w"
+                        />
+
+                    <ImageView
+                        android:id="@+id/msg_view_title_layout_iv_day_night"
+                        android:layout_width="20dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:src="@mipmap/ic_daylight_w" />
+
+                </LinearLayout>
+
+            </RelativeLayout>
+
+            <ImageView
+                android:layout_width="600dp"
+                android:layout_height="600dp"
+                android:src="@mipmap/msg_bg"
+                android:layout_marginBottom="@dimen/d80"
+                android:layout_marginTop="@dimen/d21"
+                android:layout_centerInParent="true"
+                />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:padding="@dimen/d30"
+                android:background="@drawable/shape_screen_bg"
+                >
+                <TextView
+                    android:id="@+id/screensacver_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="请保持安静不要大声喧哗"
+                    android:textStyle="bold"
+                    android:textColor="@color/white"
+                    android:background="@drawable/shape_screen_txt_bg"
+                    android:textSize="80sp"
+                    android:padding="@dimen/d40"
+                    android:gravity="center" />
+            </LinearLayout>
+        </RelativeLayout>
+        <include
+            android:id="@+id/activity_calling_bed_layout_title"
+            layout="@layout/view_title_layout"
+            />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d144"
+            android:background="@drawable/shape_bed_bg"
+            android:layout_marginTop="@dimen/d20"
+            android:layout_marginLeft="@dimen/d15"
+            android:layout_marginRight="@dimen/d24"
+            android:orientation="vertical"
+            >
+            <TextView
+                android:id="@+id/nurse_msg_tx_1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="*"
+                android:textSize="@dimen/font_size_18"
+                android:textColor="@color/txt_number"
+                android:textStyle="bold"
+                android:layout_marginTop="@dimen/d24"
+                android:layout_marginLeft="@dimen/d28"
+                />
+
+            <TextView
+                android:id="@+id/nurse_msg_tx_2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/nurse_msg_tx_1"
+                android:text="自定义输入"
+                android:textSize="@dimen/font_size_18"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:layout_marginTop="@dimen/d24"
+
+                />
+
+            <EditText
+                android:id="@+id/nurse_msg_ed"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d50"
+                android:hint="请保持安静不要吵闹"
+                android:paddingLeft="@dimen/d26"
+                android:textSize="@dimen/font_size_18"
+                android:gravity="center_vertical"
+                android:layout_below="@+id/nurse_msg_tx_1"
+                android:textStyle="bold"
+                android:background="@drawable/shape_n_login_ed_bg2"
+                android:layout_marginTop="@dimen/d16"
+                android:layout_marginLeft="@dimen/d28"
+                android:layout_marginRight="@dimen/d48"
+                />
+
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+
+            >
+            <RelativeLayout
+                android:layout_width="@dimen/d600"
+                android:layout_height="@dimen/d265"
+                android:background="@drawable/shape_bed_bg"
+                android:layout_marginTop="@dimen/d20"
+                android:layout_marginLeft="@dimen/d24"
+                android:orientation="vertical"
+
+                >
+                <TextView
+                    android:id="@+id/nurse_msg_tx_3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="*"
+                    android:textSize="@dimen/font_size_18"
+                    android:textColor="@color/txt_number"
+                    android:textStyle="bold"
+                    android:layout_marginTop="@dimen/d24"
+                    android:layout_marginLeft="@dimen/d28"
+                    />
+
+                <TextView
+                    android:id="@+id/nurse_msg_tx_4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@+id/nurse_msg_tx_3"
+                    android:text="快捷提示语"
+                    android:textSize="@dimen/font_size_18"
+                    android:textColor="@color/black"
+                    android:textStyle="bold"
+                    android:layout_marginTop="@dimen/d24"
+                    />
+
+                <RelativeLayout
+                    android:id="@+id/nurse_msg_tx_rl"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_below="@+id/nurse_msg_tx_3"
+                    >
+                    <TextView
+                        android:id="@+id/nurse_msg_tx_5"
+                        android:layout_width="@dimen/d270"
+                        android:layout_height="@dimen/d48"
+                        android:gravity="center"
+                        android:text="保持安静"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/text_name_color"
+                        android:layout_marginTop="@dimen/d20"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:background="@drawable/shape_time_f_bg"
+                        />
+                    <TextView
+                        android:id="@+id/nurse_msg_tx_6"
+                        android:layout_width="@dimen/d270"
+                        android:layout_height="@dimen/d48"
+                        android:layout_below="@+id/nurse_msg_tx_5"
+                        android:gravity="center"
+                        android:text="请勿大声喧哗"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/text_name_color"
+                        android:layout_marginTop="@dimen/d16"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:background="@drawable/shape_time_f_bg"
+                        />
+                    <TextView
+                        android:id="@+id/nurse_msg_tx_7"
+                        android:layout_width="@dimen/d270"
+                        android:layout_height="@dimen/d48"
+                        android:layout_below="@+id/nurse_msg_tx_6"
+                        android:gravity="center"
+                        android:text="正在如厕请勿进入"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/text_name_color"
+                        android:layout_marginTop="@dimen/d16"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:background="@drawable/shape_time_f_bg"
+                        />
+                    <TextView
+                        android:id="@+id/nurse_msg_tx_8"
+                        android:layout_width="@dimen/d270"
+                        android:layout_height="@dimen/d48"
+                        android:layout_toRightOf="@+id/nurse_msg_tx_5"
+                        android:gravity="center"
+                        android:text="正在护理请勿打扰"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/text_name_color"
+                        android:layout_marginTop="@dimen/d20"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:background="@drawable/shape_time_f_bg"
+                        />
+                    <TextView
+                        android:id="@+id/nurse_msg_tx_9"
+                        android:layout_width="@dimen/d270"
+                        android:layout_height="@dimen/d48"
+                        android:layout_below="@+id/nurse_msg_tx_5"
+                        android:layout_toRightOf="@+id/nurse_msg_tx_6"
+                        android:gravity="center"
+                        android:text="请勿探视"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/text_name_color"
+                        android:layout_marginTop="@dimen/d16"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:background="@drawable/shape_time_f_bg"
+                        />
+                    <TextView
+                        android:id="@+id/nurse_msg_tx_10"
+                        android:layout_width="@dimen/d270"
+                        android:layout_height="@dimen/d48"
+                        android:layout_below="@+id/nurse_msg_tx_6"
+                        android:layout_toRightOf="@+id/nurse_msg_tx_7"
+                        android:gravity="center"
+                        android:text="请不要过多人聚集"
+                        android:textSize="@dimen/font_size_16"
+                        android:textColor="@color/text_name_color"
+                        android:layout_marginTop="@dimen/d16"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:background="@drawable/shape_time_f_bg"
+                        />
+
+                </RelativeLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_tips_main_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_below="@+id/nurse_msg_tx_3"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:layout_marginRight="@dimen/d28"
+                    android:layout_marginTop="@dimen/d20"
+                    android:layout_marginBottom="@dimen/d15"
+                    android:visibility="gone"
+
+                    />
+
+            </RelativeLayout>
+            <RelativeLayout
+                android:layout_width="@dimen/d365"
+                android:layout_height="@dimen/d265"
+                android:background="@drawable/shape_bed_bg"
+                android:layout_marginTop="@dimen/d20"
+                android:layout_marginRight="@dimen/d28"
+                android:layout_marginLeft="@dimen/d15"
+                android:orientation="vertical"
+                >
+                <TextView
+                    android:id="@+id/nurse_msg_tx_11"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="*"
+                    android:textSize="@dimen/font_size_18"
+                    android:textColor="@color/txt_number"
+                    android:textStyle="bold"
+                    android:layout_marginTop="@dimen/d24"
+                    android:layout_marginLeft="@dimen/d28"
+                    />
+
+                <TextView
+                    android:id="@+id/nurse_msg_tx_12"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@+id/nurse_msg_tx_11"
+                    android:text="设置提示时间"
+                    android:textSize="@dimen/font_size_18"
+                    android:textColor="@color/black"
+                    android:textStyle="bold"
+                    android:layout_marginTop="@dimen/d24"
+                    />
+
+                <TextView
+                    android:id="@+id/nurse_msg_tx_13"
+                    android:layout_width="@dimen/d150"
+                    android:layout_height="@dimen/d48"
+                    android:layout_below="@+id/nurse_msg_tx_11"
+                    android:gravity="center"
+                    android:text="10分钟"
+                    android:textSize="@dimen/font_size_16"
+                    android:textColor="@color/text_name_color"
+                    android:layout_marginTop="@dimen/d20"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:background="@drawable/shape_time_f_bg"
+                    />
+                <TextView
+                    android:id="@+id/nurse_msg_tx_14"
+                    android:layout_width="@dimen/d150"
+                    android:layout_height="@dimen/d48"
+                    android:layout_below="@+id/nurse_msg_tx_13"
+                    android:gravity="center"
+                    android:text="30分钟"
+                    android:textSize="@dimen/font_size_16"
+                    android:textColor="@color/text_name_color"
+                    android:layout_marginTop="@dimen/d16"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:background="@drawable/shape_time_f_bg"
+                    />
+                <TextView
+                    android:id="@+id/nurse_msg_tx_15"
+                    android:layout_width="@dimen/d150"
+                    android:layout_height="@dimen/d48"
+                    android:layout_below="@+id/nurse_msg_tx_14"
+                    android:gravity="center"
+                    android:text="90分钟"
+                    android:textSize="@dimen/font_size_16"
+                    android:textColor="@color/text_name_color"
+                    android:layout_marginTop="@dimen/d16"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:background="@drawable/shape_time_f_bg"
+                    />
+                <TextView
+                    android:id="@+id/nurse_msg_tx_16"
+                    android:layout_width="@dimen/d150"
+                    android:layout_height="@dimen/d48"
+                    android:layout_below="@+id/nurse_msg_tx_11"
+                    android:layout_toRightOf="@+id/nurse_msg_tx_13"
+                    android:gravity="center"
+                    android:text="15分钟"
+                    android:textSize="@dimen/font_size_16"
+                    android:textColor="@color/text_name_color"
+                    android:layout_marginTop="@dimen/d20"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:background="@drawable/shape_time_f_bg"
+                    />
+                <TextView
+                    android:id="@+id/nurse_msg_tx_17"
+                    android:layout_width="@dimen/d150"
+                    android:layout_height="@dimen/d48"
+                    android:layout_below="@+id/nurse_msg_tx_13"
+                    android:layout_toRightOf="@+id/nurse_msg_tx_14"
+                    android:gravity="center"
+                    android:text="60分钟"
+                    android:textSize="@dimen/font_size_16"
+                    android:textColor="@color/text_name_color"
+                    android:layout_marginTop="@dimen/d16"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:background="@drawable/shape_time_f_bg"
+                    />
+                <TextView
+                    android:id="@+id/nurse_msg_tx_18"
+                    android:layout_width="@dimen/d150"
+                    android:layout_height="@dimen/d48"
+                    android:layout_below="@+id/nurse_msg_tx_14"
+                    android:layout_toRightOf="@+id/nurse_msg_tx_15"
+                    android:gravity="center"
+                    android:text="120分钟"
+                    android:textSize="@dimen/font_size_16"
+                    android:textColor="@color/text_name_color"
+                    android:layout_marginTop="@dimen/d16"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:background="@drawable/shape_time_f_bg"
+                    />
+            </RelativeLayout>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/nurse_msg_bt"
+            android:layout_width="@dimen/d420"
+            android:layout_height="@dimen/d60"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:text="开始提示"
+            android:textColor="@color/white"
+            android:background="@drawable/shape_main_hos_txt_bg"
+            android:layout_marginTop="@dimen/d26"
+            android:textSize="@dimen/font_size_20" />
+    </LinearLayout>
+
+</layout>

+ 662 - 0
android_bed/src/main/res/layout-land/callingbed_setting_main.xml

@@ -0,0 +1,662 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="#F7F7F7">
+
+        <include
+            android:id="@+id/activity_calling_door_layout_title"
+            layout="@layout/view_title_layout"
+            />
+
+          <RelativeLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="@dimen/d220"
+                 android:background="@drawable/shape_bed_bg"
+                 android:layout_marginTop="@dimen/d20"
+                 android:layout_marginLeft="@dimen/d15"
+                 android:layout_marginRight="@dimen/d24"
+                 android:orientation="vertical"
+                 >
+              <ImageView
+                  android:id="@+id/settings_img"
+                  android:layout_width="@dimen/d24"
+                  android:layout_height="@dimen/d24"
+                  android:background="@mipmap/shbei"
+                  android:layout_marginTop="@dimen/d16"
+                  android:layout_marginLeft="@dimen/d20"
+                  />
+
+                 <TextView
+                     android:id="@+id/settings_tx_2"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_toRightOf="@+id/settings_img"
+                     android:text="设备调试"
+                     android:textSize="@dimen/font_size_18"
+                     android:layout_marginLeft="@dimen/d10"
+                     android:textColor="@color/black"
+                     android:textStyle="bold"
+                     android:layout_marginTop="@dimen/d16"
+
+                     />
+              <LinearLayout
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:orientation="horizontal"
+                  android:layout_marginLeft="@dimen/d20"
+                  android:layout_marginTop="@dimen/d16"
+                  android:layout_marginBottom="@dimen/d26"
+                  android:layout_below="@+id/settings_img"
+                  >
+                  <LinearLayout
+                      android:id="@+id/settings_main_1_ll"
+                      android:layout_width="@dimen/d165"
+                      android:layout_height="match_parent"
+                      android:layout_marginRight="@dimen/d25"
+                      android:background="@mipmap/fuwu_bg"
+                      android:clickable="true"
+                      android:gravity="center_horizontal"
+                      android:orientation="vertical">
+
+                      <ImageView
+                          android:layout_width="@dimen/d30"
+                          android:layout_height="@dimen/d30"
+                          android:layout_marginTop="@dimen/d22"
+                          android:src="@mipmap/fuwu" />
+
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginTop="@dimen/d12"
+                          android:text="服务器设置"
+                          android:textColor="@color/white"
+                          android:textSize="@dimen/font_size_14"
+                          android:textStyle="bold" />
+
+                      <TextView
+                          android:id="@+id/settings_main_1_tx"
+                          android:layout_width="@dimen/d58"
+                          android:layout_height="@dimen/d20"
+                          android:layout_marginTop="@dimen/d21"
+                          android:background="@drawable/shape_n_login_ed_bg"
+                          android:gravity="center"
+                          android:text="立即设置"
+                          android:textColor="#3A78EF"
+                          android:textSize="@dimen/font_size_10" />
+                  </LinearLayout>
+                  <LinearLayout
+                      android:id="@+id/settings_main_2_ll"
+                      android:layout_width="@dimen/d165"
+                      android:layout_height="match_parent"
+                      android:gravity="center_horizontal"
+                      android:orientation="vertical"
+                      android:clickable="true"
+                      android:background="@mipmap/wl_bg"
+                      android:layout_marginRight="@dimen/d25"
+                      >
+                      <ImageView
+                          android:layout_width="@dimen/d30"
+                          android:layout_height="@dimen/d30"
+                          android:src="@mipmap/wangluo"
+                          android:layout_marginTop="@dimen/d22"
+                          />
+
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="网络设置"
+                          android:textSize="@dimen/font_size_14"
+                          android:textColor="@color/white"
+                          android:textStyle="bold"
+                          android:layout_marginTop="@dimen/d12"
+                          />
+
+                      <TextView
+                          android:id="@+id/settings_main_2_tx"
+                          android:layout_width="@dimen/d58"
+                          android:layout_height="@dimen/d20"
+                          android:text="立即设置"
+                          android:textSize="@dimen/font_size_10"
+                          android:textColor="#57D64E"
+                          android:gravity="center"
+                          android:layout_marginTop="@dimen/d21"
+                          android:background="@drawable/shape_n_login_ed_bg"
+                          />
+                  </LinearLayout>
+                  <LinearLayout
+                      android:id="@+id/settings_main_3_ll"
+                      android:layout_width="@dimen/d165"
+                      android:layout_height="match_parent"
+                      android:gravity="center_horizontal"
+                      android:orientation="vertical"
+                      android:clickable="true"
+                      android:background="@mipmap/tiaoshi_bg"
+                      android:layout_marginRight="@dimen/d25"
+                      >
+                      <ImageView
+                          android:layout_width="@dimen/d30"
+                          android:layout_height="@dimen/d30"
+                          android:src="@mipmap/tiaoshi"
+                          android:layout_marginTop="@dimen/d22"
+                          />
+
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="进入调试"
+                          android:textSize="@dimen/font_size_14"
+                          android:textColor="@color/white"
+                          android:textStyle="bold"
+                          android:layout_marginTop="@dimen/d12"
+                          />
+
+                      <TextView
+                          android:id="@+id/settings_main_3_tx"
+                          android:layout_width="@dimen/d58"
+                          android:layout_height="@dimen/d20"
+                          android:text="开始调试"
+                          android:textSize="@dimen/font_size_10"
+                          android:textColor="#FF924A"
+                          android:gravity="center"
+                          android:layout_marginTop="@dimen/d21"
+                          android:background="@drawable/shape_n_login_ed_bg"
+                          />
+                  </LinearLayout>
+                  <LinearLayout
+                      android:id="@+id/settings_main_4_ll"
+                      android:layout_width="@dimen/d165"
+                      android:layout_height="match_parent"
+                      android:gravity="center_horizontal"
+                      android:orientation="vertical"
+                      android:clickable="true"
+                      android:background="@mipmap/banben_bg"
+                      android:layout_marginRight="@dimen/d25"
+                      >
+                      <ImageView
+                          android:layout_width="@dimen/d30"
+                          android:layout_height="@dimen/d30"
+                          android:src="@mipmap/banben"
+                          android:layout_marginTop="@dimen/d22"
+                          />
+
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="版本更新"
+                          android:textSize="@dimen/font_size_14"
+                          android:textColor="@color/white"
+                          android:textStyle="bold"
+                          android:layout_marginTop="@dimen/d12"
+                          />
+
+                      <TextView
+                          android:id="@+id/settings_main_4_tx"
+                          android:layout_width="@dimen/d58"
+                          android:layout_height="@dimen/d20"
+                          android:text="更新版本"
+                          android:textSize="@dimen/font_size_10"
+                          android:textColor="#EE3B3B"
+                          android:gravity="center"
+                          android:layout_marginTop="@dimen/d21"
+                          android:background="@drawable/shape_n_login_ed_bg"
+                          />
+                  </LinearLayout>
+                  <LinearLayout
+                      android:id="@+id/settings_main_5_ll"
+                      android:layout_width="@dimen/d165"
+                      android:layout_height="match_parent"
+                      android:gravity="center_horizontal"
+                      android:orientation="vertical"
+                      android:clickable="true"
+                      android:background="@mipmap/cq_bg"
+                      android:layout_marginRight="@dimen/d19"
+                      >
+                      <ImageView
+                          android:layout_width="@dimen/d30"
+                          android:layout_height="@dimen/d30"
+                          android:src="@mipmap/cq"
+                          android:layout_marginTop="@dimen/d22"
+                          />
+
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="重启设备"
+                          android:textSize="@dimen/font_size_14"
+                          android:textColor="@color/white"
+                          android:textStyle="bold"
+                          android:layout_marginTop="@dimen/d12"
+                          />
+
+                      <TextView
+                          android:id="@+id/settings_main_5_tx"
+                          android:layout_width="@dimen/d58"
+                          android:layout_height="@dimen/d20"
+                          android:text="立即重启"
+                          android:textSize="@dimen/font_size_10"
+                          android:textColor="#FF924A"
+                          android:gravity="center"
+                          android:layout_marginTop="@dimen/d21"
+                          android:background="@drawable/shape_n_login_ed_bg"
+                          />
+                  </LinearLayout>
+              </LinearLayout>
+          </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <ScrollView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d15"
+            android:layout_marginTop="@dimen/d15"
+            android:layout_marginBottom="@dimen/d15">
+
+            <RelativeLayout
+                android:layout_width="@dimen/d700"
+                android:layout_height="@dimen/d290"
+                android:background="@drawable/shape_bed_bg"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/settings_img1"
+                    android:layout_width="@dimen/d24"
+                    android:layout_height="@dimen/d24"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:layout_marginTop="@dimen/d16"
+                    android:background="@mipmap/xinxi" />
+
+                <TextView
+                    android:id="@+id/nurse_msg_tx_4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d16"
+                    android:layout_toRightOf="@+id/settings_img1"
+                    android:text="设备信息"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:id="@+id/settings_main_6_ll"
+                    android:layout_width="@dimen/d325"
+                    android:layout_height="@dimen/d38"
+                    android:layout_below="@+id/settings_img1"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:layout_marginTop="@dimen/d17"
+                    android:background="@drawable/shape_settings_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d12"
+                        android:layout_weight="0.4"
+                        android:text="ID"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/settings_main_6_tx"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/settings_main_7_ll"
+                    android:layout_width="@dimen/d325"
+                    android:layout_height="@dimen/d38"
+                    android:layout_below="@+id/settings_img1"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d17"
+                    android:layout_toRightOf="@+id/settings_main_6_ll"
+                    android:background="@drawable/shape_settings_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d12"
+                        android:layout_weight="0.4"
+                        android:text="IP"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/settings_main_7_tx"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/settings_main_8_ll"
+                    android:layout_width="@dimen/d325"
+                    android:layout_height="@dimen/d38"
+                    android:layout_below="@+id/settings_main_6_ll"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:layout_marginTop="@dimen/d7"
+                    android:background="@drawable/shape_settings_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d12"
+                        android:layout_weight="0.4"
+                        android:text="网关"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/settings_main_8_tx"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/settings_main_9_ll"
+                    android:layout_width="@dimen/d325"
+                    android:layout_height="@dimen/d38"
+                    android:layout_below="@+id/settings_main_7_ll"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d7"
+                    android:layout_toRightOf="@+id/settings_main_8_ll"
+                    android:background="@drawable/shape_settings_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d12"
+                        android:layout_weight="0.4"
+                        android:text="DNS"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/settings_main_9_tx"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/settings_main_10_ll"
+                    android:layout_width="@dimen/d325"
+                    android:layout_height="@dimen/d38"
+                    android:layout_below="@+id/settings_main_8_ll"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:layout_marginTop="@dimen/d7"
+                    android:background="@drawable/shape_settings_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d12"
+                        android:layout_weight="0.4"
+                        android:text="服务器ID"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/settings_main_10_tx"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+
+                        android:text="http: //"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/settings_main_11_ll"
+                    android:layout_width="@dimen/d325"
+                    android:layout_height="@dimen/d38"
+                    android:layout_below="@+id/settings_main_9_ll"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d7"
+                    android:layout_toRightOf="@+id/settings_main_8_ll"
+                    android:background="@drawable/shape_settings_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d12"
+                        android:layout_weight="0.4"
+                        android:text="语音ID"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/settings_main_11_tx"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="00000"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/settings_main_12_ll"
+                    android:layout_width="@dimen/d325"
+                    android:layout_height="@dimen/d38"
+                    android:layout_below="@+id/settings_main_11_ll"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:layout_marginTop="@dimen/d7"
+                    android:background="@drawable/shape_settings_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d12"
+                        android:layout_weight="0.4"
+                        android:text="语音类型"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/settings_main_12_tx"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+
+                        android:text="000类型"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/settings_main_13_ll"
+                    android:layout_width="@dimen/d325"
+                    android:layout_height="@dimen/d38"
+                    android:layout_below="@+id/settings_main_11_ll"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d7"
+                    android:layout_toRightOf="@+id/settings_main_12_ll"
+                    android:background="@drawable/shape_settings_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d12"
+                        android:layout_weight="0.4"
+                        android:text="语音服务器"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/settings_main_13_tx"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="服务器"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/settings_main_14_ll"
+                    android:layout_width="@dimen/d325"
+                    android:layout_height="@dimen/d38"
+                    android:layout_below="@+id/settings_main_12_ll"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:layout_marginTop="@dimen/d7"
+                    android:background="@drawable/shape_settings_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d12"
+                        android:layout_weight="0.4"
+                        android:text="APP版本"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/settings_main_14_tx"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+
+                        android:text="V 0.0.0"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/settings_main_15_ll"
+                    android:layout_width="@dimen/d325"
+                    android:layout_height="@dimen/d38"
+                    android:layout_below="@+id/settings_main_12_ll"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d7"
+                    android:layout_toRightOf="@+id/settings_main_12_ll"
+                    android:background="@drawable/shape_settings_txt_bg"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d12"
+                        android:layout_weight="0.4"
+                        android:text="发布日期"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/settings_main_15_tx"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="00/00/00"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_bt_switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/settings_main_14_ll"
+                    android:layout_marginLeft="@dimen/d22"
+                    android:layout_marginTop="@dimen/d20"
+                    android:layout_marginBottom="@dimen/d20"
+                    android:gravity="center">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="20sp"
+                        android:textColor="@color/main_color"
+                        android:text="蓝牙网关:"/>
+
+                    <Switch
+                        android:id="@+id/switch_bluetooth"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:switchMinWidth="40dp"
+                        android:thumb="@drawable/thumb_selector"
+                        android:track="@drawable/track_selector"/>
+                </LinearLayout>
+            </RelativeLayout>
+        </ScrollView>
+
+        <LinearLayout
+            android:layout_width="@dimen/d265"
+            android:layout_height="@dimen/d290"
+            android:background="@drawable/shape_bed_bg"
+            android:layout_marginLeft="@dimen/d20"
+            android:layout_marginTop="@dimen/d15"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/settings_img2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="扫描二维码"
+                android:drawableLeft="@mipmap/saom"
+                android:drawablePadding="@dimen/d8"
+                android:textSize="@dimen/font_size_18"
+                android:clickable="true"
+                android:textColor="@color/black"
+                android:textStyle="bold" />
+
+            <ImageView
+                android:id="@+id/setting_qr_code"
+                android:layout_width="200dp"
+                android:layout_height="200dp"
+                android:layout_marginTop="@dimen/d14" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    </LinearLayout>
+
+</layout>

+ 292 - 0
android_bed/src/main/res/layout-land/callingbed_test_main.xml

@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="#F7F7F7">
+
+        <include
+            android:id="@+id/activity_calling_door_layout_title"
+            layout="@layout/view_title_layout" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:id="@+id/ll_sip_config_view"
+                android:layout_width="@dimen/d475"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/d24"
+                android:layout_marginTop="@dimen/d63"
+                android:layout_marginBottom="@dimen/d50"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="@dimen/d88"
+                    android:layout_height="@dimen/d88"
+                    android:layout_marginTop="@dimen/d66"
+                    android:src="@mipmap/hedimg" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:gravity="center"
+                    android:text="请输入目标SIP账号"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
+
+                <TextView
+
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d7"
+                    android:gravity="center"
+                    android:text="输入账号进行测试"
+                    android:textColor="#7D7D7D"
+                    android:textSize="@dimen/font_size_13" />
+
+                <EditText
+                    android:id="@+id/password_ed"
+                    android:layout_width="@dimen/d383"
+                    android:layout_height="@dimen/d52"
+                    android:layout_below="@+id/nurse_msg_tx_1"
+                    android:layout_marginTop="@dimen/d16"
+                    android:background="@drawable/shape_n_login_ed_bg2"
+                    android:gravity="center_vertical"
+                    android:hint="请输入账号"
+                    android:paddingLeft="@dimen/d26"
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
+
+                <Button
+                    android:id="@+id/text_call_button"
+                    android:layout_width="@dimen/d383"
+                    android:layout_height="@dimen/d48"
+                    android:layout_marginTop="@dimen/d20"
+                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:gravity="center"
+                    android:text="呼叫测试"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+
+                    android:textSize="16sp" />
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="@dimen/d491"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/d16"
+                android:layout_marginTop="@dimen/d63"
+                android:layout_marginRight="@dimen/d28"
+                android:layout_marginBottom="@dimen/d50"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="66dp"
+                    android:gravity="center"
+                    android:text="外接设备测试"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d7"
+                    android:gravity="center"
+                    android:text="请检查外接设备是否已连接再开始测试"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/font_size_13" />
+
+                <LinearLayout
+                    android:id="@+id/text_ll_1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d23"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/text_sbaj_button"
+                        android:layout_width="@dimen/d383"
+                        android:layout_height="@dimen/d48"
+                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:gravity="center"
+                        android:text="手柄按键测试"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+
+                        android:textSize="16sp" />
+
+                    <ImageView
+                        android:id="@+id/sbaj_img"
+                        android:layout_width="@dimen/d16"
+                        android:layout_height="@dimen/d16"
+                        android:layout_marginLeft="@dimen/d8"
+                        android:background="@mipmap/gou"
+                        android:visibility="invisible" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/text_ll_2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d23"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/text_sbqx_button"
+                        android:layout_width="@dimen/d383"
+                        android:layout_height="@dimen/d48"
+                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:gravity="center"
+                        android:text="手柄取消测试"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+
+                        android:textSize="16sp" />
+
+                    <ImageView
+                        android:id="@+id/sbqx_img"
+                        android:layout_width="@dimen/d16"
+                        android:layout_height="@dimen/d16"
+                        android:layout_marginLeft="@dimen/d8"
+                        android:background="@mipmap/gou"
+                        android:visibility="invisible" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/text_ll_3"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d16"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/mbhj_button"
+                        android:layout_width="@dimen/d383"
+                        android:layout_height="@dimen/d48"
+                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:gravity="center"
+                        android:text="面板按键测试"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+
+                        android:textSize="16sp" />
+
+                    <ImageView
+                        android:id="@+id/mbh_img"
+                        android:layout_width="@dimen/d16"
+                        android:layout_height="@dimen/d16"
+                        android:layout_marginLeft="@dimen/d8"
+                        android:background="@mipmap/gou"
+                        android:visibility="invisible" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/text_ll_4"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d16"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/mbhjqx_button"
+                        android:layout_width="@dimen/d383"
+                        android:layout_height="@dimen/d48"
+                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:gravity="center"
+                        android:text="面板取消测试"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+                        android:textSize="16sp" />
+
+                    <ImageView
+                        android:id="@+id/mbhjjqx_img"
+                        android:layout_width="@dimen/d16"
+                        android:layout_height="@dimen/d16"
+                        android:layout_marginLeft="@dimen/d8"
+                        android:background="@mipmap/gou"
+                        android:visibility="invisible" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/text_ll_5"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d16"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/sos_button"
+                        android:layout_width="@dimen/d383"
+                        android:layout_height="@dimen/d48"
+                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:gravity="center"
+                        android:text="紧急按钮测试"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+                        android:textSize="16sp" />
+
+                    <ImageView
+                        android:id="@+id/sos_img"
+                        android:layout_width="@dimen/d16"
+                        android:layout_height="@dimen/d16"
+                        android:layout_marginLeft="@dimen/d8"
+                        android:background="@mipmap/gou"
+                        android:visibility="invisible" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/text_ll_6"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d16"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/lycs_button"
+                        android:layout_width="@dimen/d383"
+                        android:layout_height="@dimen/d48"
+                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:clickable="true"
+                        android:drawableLeft="@mipmap/lu"
+                        android:drawablePadding="@dimen/d16"
+                        android:gravity="center_vertical"
+                        android:paddingLeft="@dimen/d88"
+                        android:text="录音测试(点击按钮说话10s)"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+                        android:textSize="16sp" />
+
+                    <ImageView
+                        android:id="@+id/lycs_img"
+                        android:layout_width="@dimen/d16"
+                        android:layout_height="@dimen/d16"
+                        android:layout_marginLeft="@dimen/d8"
+                        android:background="@mipmap/gou"
+                        android:visibility="invisible" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</layout>

+ 162 - 0
android_bed/src/main/res/layout-land/cost_view_lay.xml

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#EAF2F9"
+    android:orientation="vertical"
+    >
+    
+    <include
+        android:id="@+id/activity_calling_door_layout_title"
+        layout="@layout/view_title_layout"
+        />
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/d80"
+        android:layout_marginTop="@dimen/d23"
+        android:layout_marginLeft="@dimen/d20"
+        android:orientation="horizontal"
+        >
+        <LinearLayout
+            android:layout_width="380dp"
+            android:layout_height="72dp"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:background="@drawable/shape_bed_bg"
+            >
+            <ImageView
+                android:layout_width="@dimen/d40"
+                android:layout_height="@dimen/d40"
+                android:layout_marginLeft="@dimen/d13"
+                android:src="@mipmap/feiy" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="费用明细"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:textSize="@dimen/font_size_18"
+                android:layout_marginLeft="@dimen/d10"
+                android:gravity="center" />
+            <TextView
+                android:id="@+id/cost_statistics_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="共计23条"
+                android:textColor="@color/cost_list_title"
+                android:textSize="@dimen/font_size_16"
+                android:layout_marginLeft="@dimen/d10"
+                android:gravity="center" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="共计"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18"
+                android:layout_marginLeft="@dimen/d10"
+                android:gravity="center" />
+
+            <TextView
+                android:id="@+id/cost_all_money_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="¥8960 "
+                android:textColor="@color/red_color"
+                android:textSize="@dimen/font_size_16"
+                android:layout_marginLeft="@dimen/d10"
+                android:gravity="center" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="340dp"
+            android:layout_height="72dp"
+            android:orientation="horizontal"
+            android:layout_marginLeft="@dimen/d20"
+            android:gravity="center_vertical"
+            android:background="@drawable/shape_bed_bg"
+            android:visibility="invisible"
+            >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="费用明细"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:textSize="@dimen/font_size_18"
+                android:layout_marginLeft="@dimen/d10"
+                android:gravity="center" />
+
+            <TextView
+                android:layout_width="@dimen/d99"
+                android:layout_height="@dimen/d35"
+                android:text="2023/05/04"
+                android:textColor="@color/cost_list_title"
+                android:textSize="@dimen/font_size_14"
+                android:layout_marginLeft="@dimen/d10"
+                android:background="@drawable/shape_fy_time_bg"
+                android:gravity="center" />
+            <View
+                android:layout_width="@dimen/d15"
+                android:layout_height="0.5dp"
+                android:layout_marginLeft="@dimen/d2"
+                android:layout_marginRight="@dimen/d2"
+                android:background="@color/cost_list_title"/>
+
+            <TextView
+                android:layout_width="@dimen/d99"
+                android:layout_height="@dimen/d35"
+                android:text="2023/05/04"
+                android:textColor="@color/cost_list_title"
+                android:textSize="@dimen/font_size_14"
+                android:layout_marginLeft="@dimen/d10"
+                android:background="@drawable/shape_fy_time_bg"
+                android:gravity="center" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="230dp"
+            android:layout_height="72dp"
+            android:orientation="horizontal"
+            android:layout_marginLeft="@dimen/d20"
+            android:gravity="center"
+            android:background="@drawable/shape_bed_bg"
+            >
+            <Button
+                android:id="@+id/cost_previous_button"
+                android:layout_width="@dimen/d92"
+                android:layout_height="@dimen/d35"
+                android:gravity="center"
+                android:background="@drawable/shape_button_bg2"
+                android:text="上一页"
+                android:textSize="16sp"
+                android:textColor="@color/cc"/>
+            <Button
+                android:id="@+id/cost_next_button"
+                android:layout_width="@dimen/d92"
+                android:layout_height="@dimen/d35"
+                android:gravity="center"
+                android:background="@drawable/shape_main_hos_txt_bg"
+                android:text="下一页"
+                android:textSize="16sp"
+                android:layout_marginLeft="@dimen/d10"
+                android:textColor="@drawable/selector_bottom_btn_text_color"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+    
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_cost_main_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/d20"
+        android:layout_marginRight="@dimen/d15"
+        android:layout_marginBottom="6dp"/>
+    
+</LinearLayout>
+    
+</layout>

+ 142 - 0
android_bed/src/main/res/layout-land/main_call_r_dialog.xml

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/call_r_k"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#80000000">
+    <!--<LinearLayout
+        android:id="@+id/call_r_k"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:clickable="true"
+        android:background="#80000000" />-->
+
+    <LinearLayout
+        android:id="@+id/ll_call_records"
+        android:layout_width="wrap_content"
+        android:layout_height="520dp"
+        android:orientation="horizontal"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="@dimen/d60"
+        android:background="@drawable/shape_main_call_r_bg">
+        <LinearLayout
+            android:id="@+id/main_call_r_l_view"
+            android:layout_width="@dimen/d48"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:clickable="true"
+            android:gravity="center_horizontal">
+            <ImageView
+                android:layout_width="@dimen/d20"
+                android:layout_height="@dimen/d20"
+                android:layout_marginTop="@dimen/d16"
+                android:src="@mipmap/zhankai"/>
+            <TextView
+                android:layout_width="@dimen/d20"
+                android:layout_height="wrap_content"
+                android:text="收回列表"
+                android:textSize="20sp"
+                android:layout_marginTop="@dimen/d10"
+                android:textColor="@color/black"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="142dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:gravity="center_horizontal"
+            android:layout_marginTop="@dimen/d16"
+            android:layout_marginBottom="@dimen/d50">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/main_call_r_l_rv_1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="@dimen/d300"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:gravity="center_horizontal"
+            android:layout_marginTop="@dimen/d16"
+            android:layout_marginBottom="@dimen/d50"
+            android:layout_marginLeft="@dimen/d20"
+            android:layout_marginRight="@dimen/d16">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d54"
+                android:orientation="horizontal"
+                android:background="@drawable/shape_bed_bg">
+                <RelativeLayout
+                    android:id="@+id/call_records_linlyout"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/call_records_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="8dp"
+                        android:singleLine="true"
+                        android:text="@string/str_all_call"
+                        android:textSize="22sp" />
+                    <ImageView
+                        android:id="@+id/call_records_imagev"
+                        android:layout_width="12dp"
+                        android:layout_height="4dp"
+                        android:layout_marginTop="2dp"
+                        android:layout_below="@id/call_records_tv"
+                        android:layout_centerHorizontal="true"
+                        android:src="@color/main_color"/>
+                </RelativeLayout>
+                <RelativeLayout
+                    android:id="@+id/no_answer_calls_linlyout"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/no_answer_calls_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="8dp"
+                        android:singleLine="true"
+                        android:text="@string/str_missed_call"
+                        android:textSize="22sp" />
+                    <ImageView
+                        android:id="@+id/no_answer_calls_imagev"
+                        android:layout_width="12dp"
+                        android:layout_height="4dp"
+                        android:layout_marginTop="2dp"
+                        android:layout_below="@id/no_answer_calls_tv"
+                        android:layout_centerHorizontal="true"
+                        android:visibility="gone"
+                        android:src="@color/main_color"/>
+
+                </RelativeLayout>
+
+            </LinearLayout>
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/refresh"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                bind:srlEnableLoadMore="true"
+                bind:srlEnableRefresh="true">
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/main_call_r_l_rv_2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                />
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
+
+</layout>

+ 28 - 0
android_bed/src/main/res/layout-land/main_calling.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/shape_bed_bg"
+    android:orientation="vertical"
+    >
+    <TextView
+        android:id="@+id/title_layout_tv_hospital_hl_name"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/d50"
+        android:text="呼叫记录"
+        android:gravity="center"
+        android:textColor="@color/huli_bg"
+        android:textStyle="bold"
+        android:textSize="@dimen/font_size_24" />
+
+    <androidx.recyclerview.widget.RecyclerView
+     android:id="@+id/main_calling_rv"
+     android:layout_width="match_parent"
+     android:layout_height="match_parent"
+     />
+
+</LinearLayout>
+
+</layout>

+ 103 - 0
android_bed/src/main/res/layout-land/sign_data_table_fragment_lay.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@drawable/shape_bed_bg"
+    android:padding="22dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:background="@drawable/shape_bed_bg"
+        >
+        <ImageView
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@mipmap/img_x"
+            />
+        <TextView
+            android:id="@+id/rv_sing_data_item_tx"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="血糖数据列表"
+            android:layout_marginLeft="@dimen/d20"
+            android:textSize="@dimen/font_size_18"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:background="@drawable/shape_bed_bg"
+        android:layout_marginTop="@dimen/d28"
+        >
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="序号"
+            android:textSize="@dimen/font_size_18"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            />
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="参数"
+            android:textSize="@dimen/font_size_18"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            />
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="体征值"
+            android:textSize="@dimen/font_size_18"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            />
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="测量时间"
+            android:textSize="@dimen/font_size_18"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/emptyImageView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@mipmap/list"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_sing_data_item_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/d20"
+        android:layout_marginBottom="10dp"/>
+
+
+
+</LinearLayout>
+</layout>

+ 40 - 0
android_bed/src/main/res/layout-land/sign_fragment_lay.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/am_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            bind:srlEnableRefresh="true"
+            bind:srlEnableLoadMore="false">
+
+            <ScrollView
+                android:id="@+id/am_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <!--<LinearLayout
+                    android:id="@+id/am_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical" />-->
+            </ScrollView>
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+        <TextView
+            android:id="@+id/tv_empty_sign"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="No memeberId"
+            android:textColor="@color/red_color"
+            android:textSize="36sp" />
+
+    </RelativeLayout>
+
+</layout>

+ 121 - 0
android_bed/src/main/res/layout-land/sign_graph_curve_fragment_lay.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@drawable/shape_bed_bg"
+    android:padding="22dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_bed_bg"
+        >
+        <ImageView
+            android:id="@+id/sign_graph_curve_img_top"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignParentLeft="true"
+            android:src="@mipmap/img_x"
+            />
+        <TextView
+            android:id="@+id/sign_graph_curve_text_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="血糖数据列表"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/d20"
+            android:layout_toRightOf="@+id/sign_graph_curve_img_top"
+            android:textSize="@dimen/font_size_18"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            />
+
+       <LinearLayout
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           android:orientation="horizontal"
+           android:layout_alignParentRight="true"
+           android:layout_centerVertical="true"
+           android:gravity="center"
+           >
+
+           <TextView
+               android:id="@+id/sign_graph_curve_text1_top"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:text="血糖"
+               android:layout_centerVertical="true"
+               android:textSize="@dimen/font_size_12"
+               android:textColor="@color/text_black"
+               android:textStyle="bold"
+               />
+
+           <View
+               android:id="@+id/sign_graph_curve_view_1_top"
+               android:layout_width="@dimen/d25"
+               android:layout_height="@dimen/d2"
+               android:background="@color/main_color"
+               android:layout_marginLeft="@dimen/d10"
+               android:layout_marginRight="@dimen/d30"
+               android:layout_centerVertical="true"
+               />
+
+
+           <TextView
+               android:id="@+id/sign_graph_curve_text2_top"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:text="餐后2小时"
+               android:layout_centerVertical="true"
+               android:textSize="@dimen/font_size_12"
+               android:textColor="@color/text_black"
+               android:textStyle="bold"
+               android:visibility="gone"
+               />
+
+           <View
+               android:id="@+id/sign_graph_curve_view_2_top"
+               android:layout_width="@dimen/d25"
+               android:layout_height="@dimen/d2"
+               android:background="@color/button_color"
+               android:layout_alignParentRight="true"
+               android:layout_marginLeft="@dimen/d10"
+               android:layout_centerVertical="true"
+               android:visibility="gone"
+               />
+       </LinearLayout>
+
+
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/sign_graph_d"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="单位:mm/L"
+        android:layout_centerVertical="true"
+        android:layout_toLeftOf="@+id/sign_graph_curve_view_2_top"
+        android:textSize="@dimen/font_size_12"
+        android:layout_marginTop="@dimen/d30"
+        android:textColor="@color/text_black"
+        android:textStyle="bold"
+        />
+
+    <ImageView
+        android:id="@+id/sign_graph_emptyImageView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@mipmap/list"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        />
+    <com.github.mikephil.charting.charts.LineChart
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/chart"/>
+</LinearLayout>
+
+</layout>

+ 22 - 0
android_bed/src/main/res/layout-land/sign_main_item_lay.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_vertical"
+    android:layout_marginLeft="@dimen/d25"
+    >
+    <TextView
+        android:id="@+id/sign_main_item_name"
+        android:layout_width="@dimen/d70"
+        android:layout_height="@dimen/d40"
+        android:text="血糖"
+        android:background="@drawable/shape_main_hos_txt_bg"
+        android:textSize="24sp"
+        android:gravity="center"
+        android:textColor="@color/white"/>
+</LinearLayout>
+    
+</layout>

+ 61 - 0
android_bed/src/main/res/layout-land/sign_view_item_lay.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    >
+
+
+    <LinearLayout
+        android:id="@+id/sign_view_ll_top"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/white"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/sign_item_name"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="01"
+            android:textSize="14sp"
+            android:layout_marginLeft="@dimen/d20"
+            android:gravity="center_vertical"
+            android:textColor="@color/black"/>
+        <TextView
+            android:id="@+id/sign_item_type"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="112"
+            android:textSize="14sp"
+            android:gravity="center"
+            android:textColor="@color/black"/>
+        <TextView
+            android:id="@+id/sign_item_money"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="256"
+            android:textSize="14sp"
+            android:gravity="center"
+            android:textColor="@color/black"/>
+        <TextView
+            android:id="@+id/sign_item_time"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="202-04-06 11:00"
+            android:textSize="14sp"
+            android:gravity="center"
+            android:textColor="@color/black"/>
+
+    </LinearLayout>
+
+    
+</LinearLayout>
+    
+</layout>

+ 255 - 0
android_bed/src/main/res/layout-land/sky_voice_call_layout.xml

@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+       android:id="@+id/calling_bed_layout_call_mian"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/call_bg">
+
+        <include
+            android:id="@+id/bed_call_layout_title_new"
+            layout="@layout/view_title_layout"
+
+            />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_alignParentBottom="true"
+            >
+
+            <TextView
+                android:id="@+id/call_menu_support"
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:background="@drawable/selector_zengyuan_bt"
+                android:clickable="true"
+                android:drawableTop="@mipmap/zengyuan"
+                android:layout_above="@+id/menu_call_nurse"
+                android:gravity="center"
+                android:padding="20dp"
+                android:text="@string/str_supports"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/call_menu_call_nurse"
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="@dimen/d20"
+                android:background="@drawable/shape_huli_button_bg"
+                android:clickable="false"
+                android:drawableTop="@mipmap/hujiao"
+                android:gravity="center"
+                android:paddingTop="@dimen/d20"
+                android:paddingBottom="@dimen/d20"
+                android:layout_alignParentBottom="true"
+                android:text="@string/str_call_nurse"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+
+        <ImageView
+            android:id="@+id/sky_voice_call_bg_img"
+            android:layout_width="410dp"
+            android:layout_height="310dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:visibility="gone"
+            android:src="@mipmap/call_bg_img" />
+        <!--全屏视频画面-->
+        <FrameLayout
+            android:id="@+id/fullscreen_video_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_below="@+id/bed_call_layout_title_new"
+            android:visibility="gone"/>
+
+        <!--小窗视频画面-->
+        <FrameLayout
+            android:id="@+id/pip_video_frame"
+            android:layout_width="200dp"
+            android:layout_height="240dp"
+            android:layout_gravity="top|end"
+            android:layout_marginHorizontal="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_below="@+id/bed_call_layout_title_new"
+            android:visibility="gone"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <!--语音呼叫layout-->
+            <LinearLayout
+                android:id="@+id/ll_voice_call"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/sky_voice_call_head_img"
+                    android:layout_width="120dp"
+                    android:layout_height="120dp"
+                    android:layout_marginTop="80dp"
+                    android:scaleType="centerInside"
+                    android:src="@mipmap/call_haed" />
+
+                <TextView
+                    android:id="@+id/sky_voice_call_calling_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@color/white"
+                    android:textSize="32sp" />
+
+                <TextView
+                    android:id="@+id/sky_voice_call_timeout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@color/white"
+                    android:textSize="24sp" />
+            </LinearLayout>
+
+            <!--呼出-->
+            <LinearLayout
+                android:id="@+id/sky_voice_call_outgoing"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="80dp"
+                android:orientation="vertical">
+
+                <Chronometer
+                    android:id="@+id/sky_voice_call_timer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="00:00"
+                    android:textColor="@color/white"
+                    android:textSize="24sp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp">
+
+                    <ImageView
+                        android:id="@+id/sky_voice_call_mute"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_marginRight="40dp"
+                        android:src="@drawable/av_mute_selector"
+                        android:visibility="gone"/>
+
+                    <ImageView
+                        android:id="@+id/sky_voice_call_hangup"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:src="@drawable/selector_call_hangup" />
+
+                    <ImageView
+                        android:id="@+id/sky_voice_call_speaker"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_marginLeft="40dp"
+                        android:src="@drawable/av_speaker_selector"
+                        android:visibility="gone"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!--来电-->
+            <LinearLayout
+                android:id="@+id/sky_voice_call_incoming"
+                android:layout_width="match_parent"
+                android:layout_height="140dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="80dp"
+                android:gravity="bottom"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="2" />
+
+                <ImageView
+                    android:id="@+id/sky_voice_call_ring_reject"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/selector_call_hangup" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:id="@+id/sky_voice_call_ring_pickup_audio"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/selector_call_answer" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="2" />
+
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/ll_voice_volume_bar"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="120dp"
+                android:layout_marginTop="100dp"
+                android:layout_marginBottom="100dp"
+                android:clipChildren="true"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:visibility="gone">
+                <TextView
+                    android:id="@+id/tv_volume"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:textSize="24sp"
+                    android:textColor="@color/title_text"/>
+
+                <com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper
+                    android:layout_width="24dp"
+                    android:layout_height="match_parent">
+                    <com.wdkl.ncs.android.lib.widget.VerticalSeekBar
+                        android:id="@+id/call_volume_bar"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:padding="8dp"
+                        android:max="10"
+                        android:progress="6"
+                        android:splitTrack="false"
+                        android:progressDrawable="@drawable/seek_bar_bg"
+                        android:thumb="@drawable/seek_bar_thumb"
+                        app:seekBarRotation="CW270" /> <!-- Rotation: CW90 or CW270 -->
+                </com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper>
+            </LinearLayout>
+        </RelativeLayout>
+    </RelativeLayout>
+</layout>

+ 45 - 0
android_bed/src/main/res/layout-land/update_lay.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/activity_update_text_download"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="@string/updating"
+            android:textColor="#3D3D63"
+            android:textSize="30sp" />
+
+        <TextView
+            android:id="@+id/activity_update_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/activity_update_text_download"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="40dp"
+            android:text="V--"
+            android:textSize="20sp"/>
+
+        <com.wdkl.ncs.android.lib.widget.ProgressView
+            android:id="@+id/activity_appupdate_dialog_progressview"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="30dp"
+            android:layout_marginLeft="50dp"
+            android:layout_marginRight="50dp"
+            app:haveChangeColor="true"
+            app:isShowDesc="false"
+            app:max="100"
+            app:progress="0"
+            app:progressDesc="progress:"
+            app:progressRadius="10dp" />
+
+    </RelativeLayout>
+</layout>

+ 36 - 0
android_bed/src/main/res/layout-land/voice_msg_lay.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <Chronometer
+        android:id="@+id/voice_call_timer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textColor="@color/text_name_color"
+        android:textSize="24sp"
+        android:text="00:00" />
+
+    <Button
+        android:id="@+id/tv_voice_button"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/selector_record_btn"/>
+
+    <TextView
+        android:id="@+id/tv_voice_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:gravity="center"
+        android:text="@string/str_voice_msg_btn_text"
+        android:textColor="@color/text_name_color"
+        android:textSize="28sp"/>
+</LinearLayout>
+</layout>

+ 72 - 0
android_bed/src/main/res/layout-land/webciew_lay.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/back_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:contentDescription="@null"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:src="@mipmap/back_press" />
+
+            <TextView
+                android:id="@+id/top_title_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="48dp"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:text="点餐"
+                android:textColor="@color/text_room_color"
+                android:textSize="@dimen/font_size_25" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dip"
+            android:background="#eaeaea" />
+
+        <ProgressBar
+            android:id="@+id/pb_web_base"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="2dp" />
+
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/customerScrollView1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+
+            <WebView
+                android:id="@+id/webview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                />
+        </androidx.core.widget.NestedScrollView>
+
+
+        <include
+            layout="@layout/layout_nodate"
+            android:visibility="gone" />
+    </LinearLayout>
+</layout>

+ 90 - 0
android_bed/src/main/res/layout-land/yz_view_lay.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#EAF2F9"
+    android:orientation="vertical"
+    >
+    
+    <include
+        android:id="@+id/activity_calling_door_layout_title"
+        layout="@layout/view_title_layout"
+        />
+
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/advice_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        bind:srlEnableLoadMore="true"
+        android:layout_below="@+id/activity_calling_door_layout_title"
+        bind:srlEnableRefresh="true">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_advice_main_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/d20"
+        android:layout_marginRight="@dimen/d20"
+        android:layout_below="@+id/activity_calling_door_layout_title"
+        android:layout_marginBottom="6dp"/>
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/d80"
+        android:layout_marginTop="@dimen/d23"
+        android:layout_marginLeft="@dimen/d20"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal"
+        android:background="@drawable/shape_bed_bg"
+        android:gravity="center"
+        >
+
+
+        <Button
+            android:id="@+id/cost_previous_button"
+            android:layout_width="@dimen/d92"
+            android:layout_height="@dimen/d35"
+            android:gravity="center"
+            android:background="@drawable/shape_button_bg2"
+            android:text="上一页"
+            android:textSize="16sp"
+            android:textColor="@color/cc"/>
+        <TextView
+            android:id="@+id/yz_view_page"
+            android:layout_width="@dimen/d39"
+            android:layout_height="@dimen/d39"
+            android:text="1"
+            android:textColor="@color/white"
+            android:background="@drawable/shape_papg_bg"
+            android:textSize="@dimen/font_size_20"
+            android:layout_marginLeft="@dimen/d10"
+            android:gravity="center" />
+        <Button
+            android:id="@+id/cost_next_button"
+            android:layout_width="@dimen/d92"
+            android:layout_height="@dimen/d35"
+            android:gravity="center"
+            android:background="@drawable/shape_button_bg2"
+            android:text="下一页"
+            android:textSize="16sp"
+            android:layout_marginLeft="@dimen/d10"
+            android:textColor="@color/cc"/>
+
+        <TextView
+            android:id="@+id/yz_view_all_page"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="共10页"
+            android:textColor="@color/cost_list_title"
+            android:textSize="@dimen/font_size_18"
+            android:visibility="gone"
+            android:layout_marginLeft="@dimen/d10"
+            android:gravity="center" />
+    </LinearLayout>
+</RelativeLayout>
+    
+</layout>

+ 15 - 14
android_bed/src/main/res/layout/adapter_call_records_item.xml

@@ -2,15 +2,15 @@
 <layout>
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="300dp"
-        android:layout_height="70dp"
-        android:background="#ffffff"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:background="#FFF8F9"
         android:layout_marginTop="10dp">
 
         <ImageView
             android:id="@+id/tab_imagev"
-            android:layout_width="@dimen/d39"
-            android:layout_height="@dimen/d39"
+            android:layout_width="@dimen/d60"
+            android:layout_height="@dimen/d60"
             android:layout_marginLeft="@dimen/d11"
             android:layout_centerVertical="true"
             android:src="@mipmap/ic_customer" />
@@ -18,26 +18,26 @@
             android:id="@+id/call_records_item_title"
             android:layout_width="wrap_content"
             android:layout_toRightOf="@+id/tab_imagev"
+            android:layout_alignTop="@+id/tab_imagev"
             android:layout_height="wrap_content"
             android:text="输液-事件呼叫"
             android:textStyle="bold"
             android:textColor="@color/black"
-            android:textSize="@dimen/font_size_14"
-            android:layout_marginLeft="@dimen/d5"
-            android:layout_marginTop="@dimen/d15"
+            android:textSize="@dimen/font_size_24"
+            android:layout_marginLeft="@dimen/d20"
             />
 
         <TextView
             android:id="@+id/call_records_item_time"
             android:layout_width="wrap_content"
-            android:layout_toRightOf="@+id/tab_imagev"
             android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/tab_imagev"
+            android:layout_alignBottom="@+id/tab_imagev"
+
             android:text="2023/05/04 14:04"
-            android:layout_below="@+id/call_records_item_title"
             android:textColor="@color/about_text_color"
-            android:textSize="@dimen/font_size_12"
-            android:layout_marginLeft="@dimen/d5"
-            android:layout_marginTop="@dimen/d4"
+            android:textSize="@dimen/font_size_18"
+            android:layout_marginLeft="@dimen/d20"
             />
 
         <TextView
@@ -46,11 +46,12 @@
             android:layout_height="wrap_content"
             android:text="已响应"
             android:textColor="@color/about_text_color"
-            android:textSize="@dimen/font_size_12"
+            android:textSize="@dimen/font_size_18"
             android:layout_marginTop="@dimen/d15"
             android:layout_alignParentRight="true"
             android:layout_marginRight="@dimen/d10"
             />
+
         <TextView
         android:id="@+id/call_records_item_call"
         android:layout_width="wrap_content"

+ 15 - 12
android_bed/src/main/res/layout/adapter_shijian_records_item.xml

@@ -3,33 +3,36 @@
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/sj_view"
-        android:layout_width="142dp"
-        android:layout_height="70dp"
-        android:background="#ffffff"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
+        android:layout_width="130dp"
+        android:layout_height="130dp"
+        android:background="@drawable/shape_mom_sj_rv_bg"
+        android:gravity="center"
+        android:orientation="vertical"
         android:clickable="true"
-        android:layout_marginBottom="@dimen/d10"
+        android:layout_weight="1"
+        android:layout_marginBottom="@dimen/d20"
         >
 
         <ImageView
             android:id="@+id/sj_img"
             android:layout_width="@dimen/d39"
             android:layout_height="@dimen/d39"
-            android:layout_marginLeft="@dimen/d17"
             android:layout_centerVertical="true"
             android:src="@mipmap/yaoshui" />
 
         <TextView
             android:id="@+id/sj_records_item_title"
             android:layout_width="wrap_content"
-            android:layout_toRightOf="@+id/tab_imagev"
             android:layout_height="wrap_content"
+            android:paddingTop="@dimen/d5"
+            android:paddingBottom="@dimen/d5"
+            android:paddingRight="@dimen/d22"
+            android:paddingLeft="@dimen/d22"
+            android:layout_marginTop="@dimen/d22"
+            android:background="@drawable/shape_mom_txt_bg"
             android:text="换药水"
-            android:textStyle="bold"
-            android:layout_marginLeft="@dimen/d14"
-            android:textColor="@color/black"
-            android:textSize="@dimen/font_size_14"
+            android:textColor="@color/white"
+            android:textSize="@dimen/font_size_16"
 
             />
 

+ 218 - 207
android_bed/src/main/res/layout/callingbed_activation.xml

@@ -9,9 +9,9 @@
 
         <ImageView
             android:id="@+id/activation_img"
-            android:layout_width="@dimen/d637"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@mipmap/activation_bg"
+            android:background="@mipmap/activation_p_bg"
             />
         <TextView
             android:id="@+id/activation_title"
@@ -21,8 +21,9 @@
             android:textStyle="bold"
             android:textSize="@dimen/font_size_32"
             android:textColor="@color/white"
-            android:layout_marginTop="@dimen/d98"
-            android:layout_marginLeft="@dimen/d100"
+            android:layout_marginTop="@dimen/d56"
+            android:layout_centerHorizontal="true"
+
             />
         <TextView
             android:id="@+id/activation_title_msg"
@@ -31,238 +32,248 @@
             android:text="设置右侧参数后激活"
             android:textSize="@dimen/font_size_16"
             android:textColor="@color/white"
+            android:layout_below="@+id/activation_title"
             android:textStyle="bold"
-            android:layout_marginTop="@dimen/d144"
-            android:layout_marginLeft="@dimen/d100"
+            android:layout_marginTop="@dimen/d10"
+            android:layout_centerHorizontal="true"
             />
+
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="@dimen/d370"
+            android:layout_height="@dimen/d520"
             android:orientation="vertical"
             android:gravity="center"
             android:background="@drawable/shape_bed_bg"
-            android:layout_marginTop="@dimen/d10"
-            android:layout_marginLeft="@dimen/d610"
+            android:layout_below="@+id/activation_title_msg"
+            android:layout_marginTop="@dimen/d20"
             android:layout_marginRight="@dimen/d24"
+            android:layout_centerHorizontal="true"
             android:layout_marginBottom="@dimen/d10">
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="智能健康 关爱互联系统"
+                android:textSize="@dimen/font_size_18"
+                android:textColor="@color/black"
+                android:layout_marginTop="@dimen/d35" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="扫描二维码进行激活"
+                android:textSize="@dimen/font_size_10"
+                android:textColor="@color/black"
+                android:layout_marginTop="@dimen/d10" />
+
+            <ImageView
+                android:id="@+id/activation_qr_code"
+                android:layout_width="@dimen/d112"
+                android:layout_height="@dimen/d112"
+                android:layout_marginTop="@dimen/d10" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginTop="@dimen/d10"
+                android:layout_marginLeft="@dimen/d90">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="智能健康 关爱互联系统"
-                    android:textSize="@dimen/font_size_20"
+                    android:text="当前版本号:"
+                    android:textSize="@dimen/font_size_13"
                     android:textColor="@color/black"
-                    android:layout_marginTop="@dimen/d15" />
+                    android:textStyle="bold" />
 
                 <TextView
+                    android:id="@+id/activation_v"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="扫描二维码进行激活"
+                    android:text="V1.0.1.0"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_10"
+                    android:textColor="@color/txt_setting" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginLeft="@dimen/d108"
+                android:layout_marginTop="@dimen/d15">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="本机IP:"
                     android:textSize="@dimen/font_size_13"
                     android:textColor="@color/black"
-                    android:layout_marginTop="@dimen/d5" />
+                    android:textStyle="bold" />
 
-                <ImageView
-                    android:id="@+id/activation_qr_code"
-                    android:layout_width="@dimen/d200"
-                    android:layout_height="@dimen/d200" />
+                <TextView
+                    android:id="@+id/activation_ip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="192.168.0.0"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_10"
+                    android:textColor="@color/txt_setting" />
+
+            </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginLeft="@dimen/d116"
+                android:layout_marginTop="@dimen/d15">
+
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="@dimen/d2"
-                    android:layout_marginLeft="@dimen/d90">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="当前版本号:"
-                        android:textSize="@dimen/font_size_18"
-                        android:textColor="@color/black"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/activation_v"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="V--"
-                        android:layout_marginLeft="@dimen/d10"
-                        android:textSize="@dimen/font_size_16"
-                        android:textColor="@color/txt_setting" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                    android:text="网关:"
+                    android:textSize="@dimen/font_size_13"
+                    android:textColor="@color/black"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/activation_wg"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginLeft="@dimen/d108"
-                    android:layout_marginTop="@dimen/d10">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="本机IP:"
-                        android:textSize="@dimen/font_size_18"
-                        android:textColor="@color/black"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/activation_ip"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d10"
-                        android:textSize="@dimen/font_size_16"
-                        android:textColor="@color/txt_setting" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                    android:text="192.168.0.0"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_10"
+                    android:textColor="@color/txt_setting" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginLeft="@dimen/d116"
+                android:layout_marginTop="@dimen/d15">
+
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginLeft="@dimen/d116"
-                    android:layout_marginTop="@dimen/d10">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="网关:"
-                        android:textSize="@dimen/font_size_18"
-                        android:textColor="@color/black"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/activation_wg"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d10"
-                        android:textSize="@dimen/font_size_16"
-                        android:textColor="@color/txt_setting" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                    android:text="掩码:"
+                    android:textSize="@dimen/font_size_13"
+                    android:textColor="@color/black"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/activation_ym"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="192.168.0.0"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_10"
+                    android:textColor="@color/txt_setting" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginLeft="@dimen/d108"
+                android:layout_marginTop="@dimen/d15">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="注册码:"
+                    android:textSize="@dimen/font_size_13"
+                    android:textColor="@color/black"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/activation_zcm"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginLeft="@dimen/d116"
-                    android:layout_marginTop="@dimen/d10">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="掩码:"
-                        android:textSize="@dimen/font_size_18"
-                        android:textColor="@color/black"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/activation_ym"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d10"
-                        android:textSize="@dimen/font_size_16"
-                        android:textColor="@color/txt_setting" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                    android:text="192.168.0.0"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_10"
+                    android:textColor="@color/txt_setting" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginLeft="@dimen/d100"
+                android:layout_marginTop="@dimen/d15">
+
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginLeft="@dimen/d108"
-                    android:layout_marginTop="@dimen/d10">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="注册码:"
-                        android:textSize="@dimen/font_size_18"
-                        android:textColor="@color/black"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/activation_zcm"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d10"
-                        android:textSize="@dimen/font_size_16"
-                        android:textColor="@color/txt_setting" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                    android:text="服务器IP:"
+                    android:textSize="@dimen/font_size_13"
+                    android:textColor="@color/black"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/activation_fuq"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginLeft="@dimen/d100"
-                    android:layout_marginTop="@dimen/d10">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="服务器IP:"
-                        android:textSize="@dimen/font_size_18"
-                        android:textColor="@color/black"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/activation_fuq"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d10"
-                        android:textSize="@dimen/font_size_16"
-                        android:textColor="@color/txt_setting" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                    android:text="192.168.0.0"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_10"
+                    android:textColor="@color/txt_setting" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d48"
+                android:layout_marginLeft="@dimen/d19"
+                android:layout_marginRight="@dimen/d19"
+                android:layout_marginTop="@dimen/d20"
+                android:layout_marginBottom="@dimen/d50"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/activation_settings_button"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/d48"
+                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:gravity="center"
+                    android:text="设备重启"
+                    android:layout_weight="1"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="16sp" />
+
+                <Button
+                    android:id="@+id/activation_system_button"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/d48"
+                    android:layout_marginLeft="@dimen/d14"
+                    android:layout_marginRight="@dimen/d14"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:gravity="center"
+                    android:text="系统设置"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="16sp" />
+
+                <Button
+                    android:id="@+id/activation_services_button"
+                    android:layout_width="0dp"
                     android:layout_height="@dimen/d48"
-                    android:layout_marginTop="@dimen/d10"
-                    android:gravity="center_vertical"
-                    android:layout_marginLeft="@dimen/d19"
-                    android:layout_marginRight="@dimen/d19"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/activation_settings_button"
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/d48"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:background="@drawable/shape_main_hos_txt_bg"
-                        android:text="重启"
-                        android:textSize="16sp"
-                        android:textColor="@drawable/selector_bottom_btn_text_color" />
-
-                    <Button
-                        android:id="@+id/activation_system_button"
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/d48"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:background="@drawable/shape_main_hos_txt_bg"
-                        android:text="系统设置"
-                        android:textSize="16sp"
-                        android:layout_marginRight="@dimen/d14"
-                        android:layout_marginLeft="@dimen/d14"
-                        android:textColor="@drawable/selector_bottom_btn_text_color" />
-
-                    <Button
-                        android:id="@+id/activation_services_button"
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/d48"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:background="@drawable/shape_main_hos_txt_bg"
-                        android:text="服务器设置"
-                        android:textSize="16sp"
-                        android:textColor="@drawable/selector_bottom_btn_text_color" />
-                </LinearLayout>
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:gravity="center"
+                    android:text="服务器设置"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="16sp" />
             </LinearLayout>
+        </LinearLayout>
 
 
     </RelativeLayout>

+ 218 - 0
android_bed/src/main/res/layout/callingbed_main_mom.xml

@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/baby_bg"
+        android:orientation="vertical"
+        >
+
+        <RelativeLayout
+            android:id="@+id/mom_view_title_layout"
+            android:layout_width="match_parent"
+            android:layout_height="42dp"
+
+            >
+            <!--设备号-->
+            <LinearLayout
+                android:id="@+id/mom_view_title_layout_return"
+                android:layout_width="@dimen/d105"
+                android:layout_height="@dimen/d30"
+                android:layout_marginLeft="20dp"
+                android:background="@drawable/shape_time_bu_bg"
+                android:clickable="true"
+                android:gravity="center"
+                android:layout_centerVertical="true"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_img"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="6dp"
+                    android:visibility="gone"
+                    android:background="@mipmap/return_b" />
+                <!--医院名称-->
+                <TextView
+                    android:id="@+id/mom_view_title_layout_tv_hospital_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="科室名称"
+                    android:textColor="@color/title_text"
+                    android:textSize="@dimen/font_size_14" />
+            </LinearLayout>
+            <TextView
+                android:id="@+id/mom_view_title_layout_tv_no"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginRight="10dp"
+                android:text="ID:"
+                android:visibility="gone"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18" />
+            <!--状态图标-->
+            <LinearLayout
+                android:id="@+id/mom_view_title_layout_ll_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="@dimen/d22"
+                    android:layout_height="@dimen/d22"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:background="@mipmap/riqi_b" />
+                <!--日期-->
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:format12Hour="yyyy-MM-dd EEEE"
+                    android:format24Hour="yyyy-MM-dd EEEE"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/font_size_14"
+                    android:layout_marginLeft="@dimen/d5"
+                    android:text="16:08"/>
+
+                <ImageView
+                    android:layout_width="@dimen/d22"
+                    android:layout_height="@dimen/d22"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="@dimen/d23"
+                    android:layout_marginRight="4dp"
+                    android:background="@mipmap/shijian_b" />
+                <!--时间-->
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:format12Hour="HH:mm"
+                    android:format24Hour="HH:mm"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/font_size_14"
+                    android:layout_marginLeft="@dimen/d5"
+                    android:layout_marginRight="@dimen/d15"
+                    android:text="16:08"/>
+
+                <!--SIP状态图标-->
+                <TextView
+                    android:id="@+id/mom_view_title_layout_tv_point"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:visibility="gone"
+                    android:background="@mipmap/sip_w"/>
+
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_iv_bt"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:visibility="gone"/>
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_iv_wifi"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:visibility="gone"/>
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_iv_tcp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:src="@mipmap/ic_tcp_fail"/>
+
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_iv_ethernet"
+                    android:layout_width="20dp"
+                    android:layout_height="22dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:src="@mipmap/ic_ethernet_success_w" />
+
+                <ImageView
+                    android:id="@+id/mom_view_title_layout_iv_day_night"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:src="@mipmap/ic_daylight_w" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/mom_mian_bt_ll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/d20"
+            android:layout_below="@+id/mom_view_title_layout"
+            android:gravity="center"
+            >
+
+            <TextView
+                android:id="@+id/mom_mian_sy_bt"
+                android:layout_width="@dimen/d230"
+                android:layout_height="@dimen/d60"
+                android:text="首页"
+                android:textStyle="bold"
+                android:textColor="@color/white"
+                android:textSize="32sp"
+                android:gravity="center"
+                android:background="@drawable/shape_baby_bg_title"
+                android:layout_centerHorizontal="true"
+                android:layout_marginRight="@dimen/d8"
+                />
+
+            <TextView
+                android:id="@+id/mom_mian_tx_bt"
+                android:layout_width="@dimen/d230"
+                android:layout_height="@dimen/d60"
+                android:layout_centerHorizontal="true"
+                android:layout_marginLeft="@dimen/d8"
+                android:background="@drawable/shape_baby_bg_title2"
+                android:gravity="center"
+                android:text="通讯列表"
+                android:textColor="@color/white"
+                android:textSize="32sp"
+                android:textStyle="bold"
+                />
+        </LinearLayout>
+
+        <!--通话界面-->
+        <FrameLayout
+            android:id="@+id/callingbed_main_mom_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/mom_mian_bt_ll"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="0dp" />
+
+        <FrameLayout
+            android:id="@+id/bed_mom_call_frame_new"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+
+    </RelativeLayout>
+</layout>

+ 106 - 0
android_bed/src/main/res/layout/mom_call_lay.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+<LinearLayout
+    android:id="@+id/calling_door_mom"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/baby_bg"
+    android:orientation="vertical"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@drawable/shape_bed_bg"
+        android:layout_marginBottom="@dimen/d20"
+        android:layout_marginLeft="@dimen/d30"
+        android:layout_marginRight="@dimen/d30">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/d100"
+            android:layout_marginLeft="@dimen/d20"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:id="@+id/mom_call_records_linlyout"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:gravity="center"
+                >
+                <TextView
+                    android:id="@+id/mom_call_records_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:singleLine="true"
+                    android:text="@string/str_all_call"
+                    android:textColor="@color/black"
+                    android:textStyle="bold"
+                    android:textSize="42sp" />
+                <ImageView
+                    android:id="@+id/mom_call_records_imagev"
+                    android:layout_width="30dp"
+                    android:layout_height="4dp"
+                    android:layout_marginTop="2dp"
+                    android:src="@color/baby_top_txt"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/mom_no_answer_calls_linlyout"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:layout_marginLeft="@dimen/d25"
+                android:gravity="center"
+                >
+                <TextView
+                    android:id="@+id/mom_no_answer_calls_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:text="@string/str_missed_call"
+                    android:textSize="33sp" />
+                <ImageView
+                    android:id="@+id/mom_no_answer_calls_imagev"
+                    android:layout_width="30dp"
+                    android:layout_height="4dp"
+                    android:layout_marginTop="2dp"
+                    android:visibility="gone"
+                    android:src="@color/baby_top_txt"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/mom_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/d10"
+            android:layout_marginLeft="@dimen/d20"
+            android:layout_marginRight="@dimen/d20"
+            bind:srlEnableLoadMore="true"
+            bind:srlEnableRefresh="true">
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/mom_call_r_l_rv_2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+    </LinearLayout>
+
+
+
+
+
+
+
+
+
+</LinearLayout>
+</layout>

+ 493 - 0
android_bed/src/main/res/layout/mom_main_lay.xml

@@ -0,0 +1,493 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<LinearLayout
+    android:id="@+id/calling_door_mom"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/baby_bg"
+    android:orientation="vertical"
+    >
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d200"
+            android:background="@mipmap/baby_bg"
+            android:layout_marginLeft="@dimen/d30"
+            android:layout_marginRight="@dimen/d30"
+            >
+
+                <TextView
+                    android:id="@+id/mom_number_tx1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="@dimen/d10"
+                    android:layout_marginRight="@dimen/d13"
+                    android:paddingLeft="@dimen/d18"
+                    android:paddingRight="@dimen/d18"
+                    android:paddingTop="@dimen/d5"
+                    android:paddingBottom="@dimen/d5"
+                    android:text="房间号:00588"
+                    android:textStyle="bold"
+                    android:textColor="@color/white"
+                    android:textSize="32sp"
+                    android:gravity="center"
+                    android:background="@drawable/shape_baby_bg_title3"
+                    />
+
+                <TextView
+                    android:id="@+id/mom_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d30"
+                    android:layout_marginLeft="@dimen/d67"
+                    android:text="宝妈姓名"
+                    android:textStyle="bold"
+                    android:textColor="@color/black"
+                    android:textSize="50sp"
+                    android:gravity="center"
+                    />
+            <TextView
+                android:id="@+id/mom_baby_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d10"
+                android:layout_marginLeft="@dimen/d67"
+                android:paddingLeft="@dimen/d24"
+                android:paddingTop="@dimen/d10"
+                android:paddingBottom="@dimen/d10"
+                android:layout_below="@+id/mom_name"
+                android:text="宝宝信息"
+                android:textColor="#F7717A"
+                android:textSize="28sp"
+                android:gravity="center"
+                android:background="@drawable/shape_mom_baby_name_bg"
+                />
+
+
+
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="390dp"
+            android:background="@mipmap/baby_bg"
+            android:layout_marginTop="15dp"
+            android:layout_marginLeft="@dimen/d30"
+            android:layout_marginRight="@dimen/d30"
+            android:gravity="center"
+            android:orientation="vertical"
+            >
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/mom_baby_sj"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/d40"
+                android:layout_marginTop="@dimen/d40"
+                android:layout_marginBottom="@dimen/d40"
+                android:layout_marginRight="@dimen/d40"
+                />
+
+            <FrameLayout
+                android:id="@+id/mom_frame_new"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/d40"
+                android:layout_marginTop="@dimen/d40"
+                android:layout_marginBottom="@dimen/d40"
+                android:layout_marginRight="@dimen/d40"
+                android:visibility="gone"
+                />
+
+            <RelativeLayout
+                android:id="@+id/mom_bt_ll"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/d20"
+                android:layout_marginTop="@dimen/d40"
+                android:layout_marginBottom="@dimen/d40"
+                android:layout_marginRight="@dimen/d20"
+                android:visibility="gone"
+                >
+                <RelativeLayout
+                    android:id="@+id/mom_bt_ll_1"
+                    android:layout_width="@dimen/d230"
+                    android:layout_height="@dimen/d85"
+                    android:background="#FFF8F9"
+                    android:clickable="true"
+                    >
+                    <ImageView
+                        android:id="@+id/other_item_img"
+                        android:layout_width="@dimen/d45"
+                        android:layout_height="@dimen/d45"
+                        android:background="@mipmap/hs_img"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        />
+
+                    <TextView
+                        android:id="@+id/other_item__type"
+                        android:layout_width="@dimen/d65"
+                        android:layout_height="wrap_content"
+                        android:text="护士主机"
+                        android:textColor="@color/black"
+                        android:textStyle="bold"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/other_item_img"
+                        android:textSize="@dimen/font_size_16"
+                        android:layout_marginLeft="@dimen/d15"
+
+                        />
+                    <ImageView
+                        android:layout_width="@dimen/d60"
+                        android:layout_height="@dimen/d28"
+                        android:background="@mipmap/mom_hu"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/other_item__type"
+                        android:layout_marginLeft="@dimen/d20"
+                        />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/mom_bt_ll_2"
+                    android:layout_width="@dimen/d230"
+                    android:layout_height="@dimen/d85"
+                    android:background="#FFF8F9"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:layout_marginRight="@dimen/d20"
+                    android:clickable="true"
+                    android:layout_toRightOf="@+id/mom_bt_ll_1"
+
+                    >
+                    <ImageView
+                        android:id="@+id/other_item_img_2"
+                        android:layout_width="@dimen/d45"
+                        android:layout_height="@dimen/d45"
+                        android:background="@mipmap/hs_img"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        />
+
+                    <TextView
+                        android:id="@+id/other_item__type_2"
+                        android:layout_width="@dimen/d65"
+                        android:layout_height="wrap_content"
+                        android:text="护士主机"
+                        android:textColor="@color/black"
+                        android:textStyle="bold"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/other_item_img_2"
+                        android:textSize="@dimen/font_size_16"
+                        android:layout_marginLeft="@dimen/d15"
+
+                        />
+                    <ImageView
+                        android:layout_width="@dimen/d60"
+                        android:layout_height="@dimen/d28"
+                        android:background="@mipmap/mom_hu"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/other_item__type_2"
+                        android:layout_marginLeft="@dimen/d20"
+                        />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/mom_bt_ll_3"
+                    android:layout_width="@dimen/d230"
+                    android:layout_height="@dimen/d85"
+                    android:background="#FFF8F9"
+                    android:layout_marginTop="@dimen/d20"
+                    android:layout_below="@+id/mom_bt_ll_1"
+                    android:clickable="true"
+                    >
+                    <ImageView
+                        android:id="@+id/other_item_img_3"
+                        android:layout_width="@dimen/d45"
+                        android:layout_height="@dimen/d45"
+                        android:background="@mipmap/hs_img"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        />
+
+                    <TextView
+                        android:id="@+id/other_item__type_3"
+                        android:layout_width="@dimen/d65"
+                        android:layout_height="wrap_content"
+                        android:text="护士主机"
+                        android:textColor="@color/black"
+                        android:textStyle="bold"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/other_item_img_3"
+                        android:textSize="@dimen/font_size_16"
+                        android:layout_marginLeft="@dimen/d15"
+
+                        />
+                    <ImageView
+                        android:layout_width="@dimen/d60"
+                        android:layout_height="@dimen/d28"
+                        android:background="@mipmap/mom_hu"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/other_item__type_3"
+                        android:layout_marginLeft="@dimen/d20"
+                        />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/mom_bt_ll_4"
+                    android:layout_width="@dimen/d230"
+                    android:layout_height="@dimen/d85"
+                    android:background="#FFF8F9"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:layout_marginRight="@dimen/d20"
+                    android:layout_marginTop="@dimen/d20"
+                    android:layout_toRightOf="@+id/mom_bt_ll_3"
+                    android:layout_below="@+id/mom_bt_ll_1"
+                    android:clickable="true"
+                    >
+                    <ImageView
+                        android:id="@+id/other_item_img_4"
+                        android:layout_width="@dimen/d45"
+                        android:layout_height="@dimen/d45"
+                        android:background="@mipmap/hs_img"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        />
+
+                    <TextView
+                        android:id="@+id/other_item__type_4"
+                        android:layout_width="@dimen/d65"
+                        android:layout_height="wrap_content"
+                        android:text="护士主机"
+                        android:textColor="@color/black"
+                        android:textStyle="bold"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/other_item_img_4"
+                        android:textSize="@dimen/font_size_16"
+                        android:layout_marginLeft="@dimen/d15"
+
+                        />
+                    <ImageView
+                        android:layout_width="@dimen/d60"
+                        android:layout_height="@dimen/d28"
+                        android:background="@mipmap/mom_hu"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/other_item__type_4"
+                        android:layout_marginLeft="@dimen/d20"
+                        />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/mom_bt_ll_5"
+                    android:layout_width="@dimen/d230"
+                    android:layout_height="@dimen/d85"
+                    android:layout_below="@+id/mom_bt_ll_3"
+                    android:layout_marginTop="18dp"
+                    android:background="#FFF8F9"
+                    android:clickable="true">
+
+                    <ImageView
+                        android:id="@+id/other_item_img_5"
+                        android:layout_width="@dimen/d45"
+                        android:layout_height="@dimen/d45"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        android:background="@mipmap/hs_img" />
+
+                    <ImageView
+                        android:layout_width="@dimen/d60"
+                        android:layout_height="@dimen/d28"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        android:layout_toRightOf="@+id/other_item__type_5"
+                        android:background="@mipmap/mom_hu" />
+
+                    <TextView
+                        android:id="@+id/other_item__type_5"
+                        android:layout_width="@dimen/d65"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d15"
+                        android:layout_toRightOf="@+id/other_item_img_5"
+                        android:text="护士主机"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_16"
+                        android:textStyle="bold"
+
+                        />
+                </RelativeLayout>
+                <RelativeLayout
+                    android:id="@+id/mom_bt_ll_6"
+                    android:layout_width="@dimen/d230"
+                    android:layout_height="@dimen/d85"
+                    android:layout_below="@+id/mom_bt_ll_3"
+                    android:layout_toRightOf="@+id/mom_bt_ll_5"
+                    android:layout_marginTop="18dp"
+                    android:background="#FFF8F9"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:clickable="true">
+
+                    <ImageView
+                        android:id="@+id/other_item_img_6"
+                        android:layout_width="@dimen/d45"
+                        android:layout_height="@dimen/d45"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        android:background="@mipmap/msg_gb" />
+
+                    <TextView
+                        android:id="@+id/other_item__type_6"
+                        android:layout_width="@dimen/d65"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d15"
+                        android:layout_toRightOf="@+id/other_item_img_6"
+                        android:text="返回首页"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_16"
+                        android:textStyle="bold"
+
+                        />
+                </RelativeLayout>
+
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:background="@mipmap/baby_bg"
+        android:layout_marginTop="15dp"
+        android:layout_marginLeft="@dimen/d30"
+        android:layout_marginRight="@dimen/d30"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:orientation="horizontal"
+        >
+
+        <LinearLayout
+            android:id="@+id/mom_call_nurse_ll"
+            android:clickable="true"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+
+            >
+            <ImageView
+                android:id="@+id/mom_call_nurse_img"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:src="@mipmap/mom_call"
+                />
+            <TextView
+                android:id="@+id/mom_call_nurse_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d22"
+                android:text="呼叫护士"
+                android:textColor="@color/black"
+                android:textSize="20sp"
+                android:gravity="center"
+                />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/mom_call_qt_ll"
+            android:clickable="true"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            >
+            <ImageView
+                android:id="@+id/mom_call_qt_img"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:src="@mipmap/mom_qt"
+                />
+            <TextView
+                android:id="@+id/mom_call_qt_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d22"
+                android:text="呼叫其他"
+                android:textColor="@color/black"
+                android:textSize="20sp"
+                android:gravity="center"
+                />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/mom_voice_message_ll"
+            android:clickable="true"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            >
+            <ImageView
+                android:id="@+id/mom_voice_message_img"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:src="@mipmap/mom_ly"
+                />
+            <TextView
+                android:id="@+id/mom_voice_message_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d22"
+                android:text="语音留言"
+                android:textColor="@color/black"
+                android:textSize="20sp"
+                android:gravity="center"
+                />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/mom_sos_ll"
+            android:clickable="true"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:gravity="center"
+            >
+            <ImageView
+                android:id="@+id/mom_sos_img"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:src="@mipmap/mom_sos"
+                />
+            <TextView
+                android:id="@+id/mom_sos_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d22"
+                android:text="SOS"
+                android:textColor="@color/black"
+                android:textSize="20sp"
+                android:gravity="center"
+                />
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+
+
+
+
+
+
+
+</LinearLayout>
+</layout>

+ 28 - 22
android_bed/src/main/res/layout/sky_voice_call_layout.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-       android:id="@+id/calling_bed_layout_call_mian"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <RelativeLayout
+        android:id="@+id/calling_bed_layout_call_mian"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@mipmap/call_bg">
@@ -88,6 +89,9 @@
             android:layout_height="match_parent">
 
             <!--语音呼叫layout-->
+
+            <!--呼出-->
+
             <LinearLayout
                 android:id="@+id/ll_voice_call"
                 android:layout_width="match_parent"
@@ -124,7 +128,6 @@
                     android:textSize="24sp" />
             </LinearLayout>
 
-            <!--呼出-->
             <LinearLayout
                 android:id="@+id/sky_voice_call_outgoing"
                 android:layout_width="wrap_content"
@@ -154,7 +157,7 @@
                         android:layout_height="100dp"
                         android:layout_marginRight="40dp"
                         android:src="@drawable/av_mute_selector"
-                        android:visibility="gone"/>
+                        android:visibility="gone" />
 
                     <ImageView
                         android:id="@+id/sky_voice_call_hangup"
@@ -168,7 +171,7 @@
                         android:layout_height="100dp"
                         android:layout_marginLeft="40dp"
                         android:src="@drawable/av_speaker_selector"
-                        android:visibility="gone"/>
+                        android:visibility="gone" />
 
                 </LinearLayout>
 
@@ -186,22 +189,12 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="2" />
-
                 <ImageView
                     android:id="@+id/sky_voice_call_ring_reject"
                     android:layout_width="100dp"
                     android:layout_height="100dp"
                     android:src="@drawable/selector_call_hangup" />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
-
                 <ImageView
                     android:id="@+id/sky_voice_call_ring_pickup_audio"
                     android:layout_width="100dp"
@@ -211,41 +204,54 @@
                 <View
                     android:layout_width="0dp"
                     android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="2" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
                     android:layout_weight="2" />
 
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ll_voice_volume_bar"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_alignParentRight="true"
+                android:layout_marginBottom="100dp"
                 android:layout_marginRight="120dp"
                 android:layout_marginTop="100dp"
-                android:layout_marginBottom="100dp"
                 android:clipChildren="true"
-                android:orientation="vertical"
                 android:gravity="center"
+                android:orientation="vertical"
                 android:visibility="gone">
+
                 <TextView
                     android:id="@+id/tv_volume"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:textSize="24sp"
-                    android:textColor="@color/title_text"/>
+                    android:textColor="@color/title_text"
+                    android:textSize="24sp" />
 
                 <com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper
                     android:layout_width="24dp"
                     android:layout_height="match_parent">
+
                     <com.wdkl.ncs.android.lib.widget.VerticalSeekBar
                         android:id="@+id/call_volume_bar"
                         android:layout_width="0dp"
                         android:layout_height="0dp"
-                        android:padding="8dp"
                         android:max="10"
+                        android:padding="8dp"
                         android:progress="6"
-                        android:splitTrack="false"
                         android:progressDrawable="@drawable/seek_bar_bg"
+                        android:splitTrack="false"
                         android:thumb="@drawable/seek_bar_thumb"
                         app:seekBarRotation="CW270" /> <!-- Rotation: CW90 or CW270 -->
                 </com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper>

+ 1 - 1
android_bed/src/main/res/layout/view_title_layout.xml

@@ -180,7 +180,7 @@
             <ImageView
                 android:id="@+id/view_title_layout_iv_day_night"
                 android:layout_width="20dp"
-                android:layout_height="wrap_content"
+                android:layout_height="20dp"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="4dp"
                 android:layout_marginRight="4dp"

+ 46 - 28
android_bed/src/main/res/layout/voice_msg_lay.xml

@@ -1,36 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical">
+   >
 
-    <Chronometer
-        android:id="@+id/voice_call_timer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textColor="@color/text_name_color"
-        android:textSize="24sp"
-        android:text="00:00" />
-
-    <Button
-        android:id="@+id/tv_voice_button"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_marginTop="20dp"
-        android:background="@drawable/selector_record_btn"/>
-
-    <TextView
-        android:id="@+id/tv_voice_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+
+    <ImageView
+        android:id="@+id/voice_call_img"
+        android:layout_width="@dimen/d40"
+        android:layout_height="@dimen/d60"
+        android:src="@mipmap/msg_gb"
+
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:gravity="center"
-        android:text="@string/str_voice_msg_btn_text"
-        android:textColor="@color/text_name_color"
-        android:textSize="28sp"/>
-</LinearLayout>
+        android:orientation="vertical"
+        >
+        <Chronometer
+            android:id="@+id/voice_call_timer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="@color/text_name_color"
+            android:textSize="24sp"
+            android:text="00:00" />
+
+        <Button
+            android:id="@+id/tv_voice_button"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/selector_record_btn"/>
+
+        <TextView
+            android:id="@+id/tv_voice_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:text="@string/str_voice_msg_btn_text"
+            android:textColor="@color/text_name_color"
+            android:textSize="28sp"/>
+
+    </LinearLayout>
+
+
+</RelativeLayout>
 </layout>

BIN
android_bed/src/main/res/mipmap-mdpi/baby_bg.png


BIN
android_bed/src/main/res/mipmap-mdpi/huchu.png


BIN
android_bed/src/main/res/mipmap-mdpi/huru.png


BIN
android_bed/src/main/res/mipmap-mdpi/mom_call.png


BIN
android_bed/src/main/res/mipmap-mdpi/mom_ly.png


BIN
android_bed/src/main/res/mipmap-mdpi/mom_qt.png


BIN
android_bed/src/main/res/mipmap-mdpi/mom_sos.png


BIN
android_bed/src/main/res/mipmap-mdpi/shijianr.png


BIN
android_bed/src/main/res/mipmap-mdpi/sos.png


BIN
android_bed/src/main/res/mipmap-xhdpi/hs_img.png


BIN
android_bed/src/main/res/mipmap-xhdpi/huchu.png


BIN
android_bed/src/main/res/mipmap-xhdpi/huru.png


BIN
android_bed/src/main/res/mipmap-xhdpi/mom_hu.png


BIN
android_bed/src/main/res/mipmap-xhdpi/msg_gb.png


BIN
android_bed/src/main/res/mipmap-xhdpi/msg_return.png


BIN
android_bed/src/main/res/mipmap-xhdpi/shijianr.png


BIN
android_bed/src/main/res/mipmap-xhdpi/sos.png


BIN
android_bed/src/main/res/mipmap-xxhdpi/huchu.png


BIN
android_bed/src/main/res/mipmap-xxhdpi/huru.png


BIN
android_bed/src/main/res/mipmap-xxhdpi/shijianr.png


BIN
android_bed/src/main/res/mipmap-xxhdpi/sos.png


+ 3 - 0
android_bed/src/main/res/values/colors.xml

@@ -96,4 +96,7 @@
     <color name="right_item_bg">#3CA2E0</color>
     <color name="right_item_select">#B1DAF3</color>
     <color name="huli_bg">#FF8484</color>
+
+    <color name="baby_bg">#FEB8BF</color>
+    <color name="baby_top_txt">#F8757E</color>
 </resources>

+ 7 - 1
app/build.gradle

@@ -102,7 +102,13 @@ android {
         //卡尔-护士主机
         kaer {
             dimension "app"
-            applicationId "com.wdkl.app.ncs.nursehost"
+
+            if (project.rootProject.ext.android_bed){
+                applicationId "com.wdkl.app.ncs.callingbed2"
+            }else  if (project.rootProject.ext.android_host){
+                applicationId "com.wdkl.app.ncs.nursehost"
+            }
+
             buildConfigField 'String', 'flag', '"6"'
         }
 

+ 5 - 5
build.gradle

@@ -48,16 +48,16 @@ buildscript {
      * 配置要打包的模块
      */
     ext.callingdoor = false
-    ext.android_bed = false
-    ext.android_host = true
-    ext.is_mom = false
+    ext.android_bed = true
+    ext.android_host = false
+    ext.is_mom = true
 
 
 
     if (callingdoor) {
         //门口机
-        ext.app_version_code = 100
-        ext.app_version = "1.3.0"
+        ext.app_version_code = 101
+        ext.app_version = "1.3.1"
     } else if (android_bed) {
         //分机
         ext.app_version_code = 100

+ 22 - 0
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/ExitHuliDialogHelper.java

@@ -2,8 +2,13 @@ package com.wdkl.app.ncs.callingdoor.dialog;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.res.Configuration;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -35,6 +40,23 @@ public class ExitHuliDialogHelper {
         alertDialog.setCancelable(true);
         alertDialog.show();
 
+        DisplayMetrics metrics = new DisplayMetrics();
+        activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        int screenWidth = metrics.widthPixels;
+        int orientation = activity.getResources().getConfiguration().orientation;
+        if (orientation == Configuration.ORIENTATION_PORTRAIT && screenWidth>600) {
+            try {
+                Window window = alertDialog.getWindow();
+                WindowManager.LayoutParams lp = window.getAttributes();
+                lp.width = 800;
+                lp.height = 650;
+                lp.gravity = Gravity.CENTER;
+                window.setAttributes(lp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
     }
     public interface ClickListener{
         void onClick();

+ 17 - 13
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/YhFragment.kt

@@ -1,8 +1,8 @@
 package com.wdkl.app.ncs.callingdoor.fragment
 
 
-import android.os.Parcel
-import android.os.Parcelable
+import android.content.res.Configuration
+import android.util.DisplayMetrics
 import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -11,24 +11,17 @@ import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity
 import com.wdkl.app.ncs.callingdoor.adapter.YhMianAdapter
 import com.wdkl.app.ncs.callingdoor.databinding.CallingdoorNurseBinding
-import com.wdkl.app.ncs.callingdoor.dialog.ExitHuliDialogHelper
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
 import com.wdkl.app.ncs.callingdoor.util.SPUtils
 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.Constant
-import com.wdkl.ncs.android.middleware.common.MessageEvent
 import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.YhFragmentContract
 import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.YhFragmentPresenter
 import com.wdkl.ncs.android.middleware.model.vo.ClerkByVO
 import com.wdkl.ncs.android.middleware.tcp.channel.YhUtil
-import kotlinx.android.synthetic.main.callingdoor_main_new.*
-import kotlinx.android.synthetic.main.callingdoor_main_new.menu_medical_care
 import kotlinx.android.synthetic.main.callingdoor_nurse.*
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
 
 
 /**
@@ -53,8 +46,19 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingdoorNurseBinding>()
     override fun init() {
         rv_nurse_main_ll.visibility = View.GONE
         adapter = YhMianAdapter(activity, ArrayList())
-        val layoutManager = GridLayoutManager(activity, 4, LinearLayoutManager.VERTICAL, false)
-        rv_nurse_main_view.layoutManager = layoutManager
+        val orientation = activity.resources.configuration.orientation
+        val metrics = DisplayMetrics()
+        activity.windowManager.defaultDisplay.getMetrics(metrics)
+        val screenWidth = metrics.widthPixels
+        if(orientation == Configuration.ORIENTATION_PORTRAIT && screenWidth > 600){
+            val layoutManager = GridLayoutManager(activity, 2, LinearLayoutManager.VERTICAL, false)
+            rv_nurse_main_view.layoutManager = layoutManager
+        }else{
+            val layoutManager = GridLayoutManager(activity, 4, LinearLayoutManager.VERTICAL, false)
+            rv_nurse_main_view.layoutManager = layoutManager
+        }
+
+
         adapter.setOnItemClickListener(this)
         rv_nurse_main_view.adapter = adapter
     }
@@ -122,9 +126,9 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingdoorNurseBinding>()
     override fun networkMonitor(state: NetState) {
         state.filter(onWifi = {
 
-        },onMobile = {
+        }, onMobile = {
 
-        },offline = {
+        }, offline = {
 
         })
     }

+ 0 - 3
janus/src/main/java/com/wdkl/ncs/janus/client/JanusClient.java

@@ -848,11 +848,8 @@ public class JanusClient implements WebSocketChannel.WebSocketCallback {
                     break;
                 }
                 case hangup: {
-
                     if (handle != null) {
-
                         if (janusCallback != null) {
-
                             janusCallback.onHangup(handle.getHandleId());
                         }
                     }

+ 4 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/api/BedDeviceApi.kt

@@ -15,6 +15,10 @@ interface BedDeviceApi {
     @GET("/deviceBed/getCustomerInfo/{customerId}")
     fun getCustomInfo(@Path("customerId") customerId :Int): Observable<ResponseBody>
 
+    //入住信息
+    @GET("/deviceBed/getRelativeList/{memberId}")
+    fun getRelativeList(@Path("memberId") memberId :Int): Observable<ResponseBody>
+
     //费用信息//废弃
     @GET("/deviceBed/getCustomerFeeConfigByGroupName/{customerId}")
     fun getCustomCost(@Path("customerId") customerId :Int): Observable<ResponseBody>

+ 16 - 1
middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java

@@ -2,8 +2,11 @@ package com.wdkl.ncs.android.middleware.common;
 
 import android.os.Environment;
 
+import com.wdkl.ncs.android.middleware.model.dos.RoleDO;
 import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum;
 
+import java.util.List;
+
 public class Constant {
 
     public static String APP_PATH = "";
@@ -16,6 +19,12 @@ public class Constant {
     public static String YH_NAME = "YH_NAME";
 
     public static final String PREFERENCE_USER = "USER_DATA";
+
+    //屏幕状态 2 亮屏,1 熄屏
+    public static Integer SCREENSTATE = 2;
+    //角色列表
+    public static List<RoleDO> ROLES = null;
+
     //设备区分
     public static final String DEV_Z_RK3128= "1";//自研rk3128
     public static final String DEV_W_XHG_RK3288 = "2";//外购新豪格rk3288
@@ -228,7 +237,7 @@ public class Constant {
     public static boolean supportCamera = false;
 
     //设备是否启动医护模块
-    public static boolean isOpenYH = false;
+    public static boolean isOpenYH = true;
 
     //是否静默升级
     public static boolean silentUpdate = true;
@@ -398,8 +407,14 @@ public class Constant {
      * 退出医护
      * */
     public static final int EVENT_EXIT_YH = 0x201;
+
     /**
      * 体征-类型
      * */
     public static final int EVENT_SING_TYPE = 0x202;
+
+    /**
+     * 月子中心-返回
+     * */
+    public static final int EVENT_MOM_return = 0x203;
 }

+ 7 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/di/PresenterComponent.kt

@@ -92,6 +92,13 @@ interface PresenterComponent {
 
     fun inject(presenter: BedCallRecordsFragmentPresenter)
 
+    fun inject(presenter: BedMomCallFragmentPresenter)
+
+    fun inject(presenter: BedMomMianFragmentPresenter)
+
+    fun inject(presenter: VoiceFragmentPresenter)
+
+
     //护士主机
     fun inject(presenter: DevicePresenter)
 

+ 27 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/callingbed/BedMomCallFragmentContract.kt

@@ -0,0 +1,27 @@
+package com.wdkl.ncs.android.middleware.logic.contract.callingbed
+
+import com.wdkl.ncs.android.lib.base.BaseContract
+import com.wdkl.ncs.android.middleware.model.vo.CallRecordVO
+import com.wdkl.ncs.android.middleware.model.vo.CustomerInfoVO
+
+interface BedMomCallFragmentContract {
+    interface View : BaseContract.BaseView {
+
+
+        /**
+         * @author LDD
+         * @Date   2018/1/19 下午5:51
+         * @From   HomeFragmentContract.View
+         * @Note   展示七巧板数据
+         */
+
+        fun showCallRecords(record : CallRecordVO)
+    }
+
+    interface Presenter : BaseContract.BasePresenter {
+
+        //获取左侧交互记录
+        fun loadCallRecords(page_no:Int, page_size:Int, customer_id:Int)
+
+    }
+}

+ 50 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/callingbed/BedMomMianFragmentContract.kt

@@ -0,0 +1,50 @@
+package com.wdkl.ncs.android.middleware.logic.contract.callingbed
+
+import com.wdkl.ncs.android.lib.base.BaseContract
+import com.wdkl.ncs.android.middleware.model.dos.EventDO
+import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
+import com.wdkl.ncs.android.middleware.model.dos.RoleDO
+import com.wdkl.ncs.android.middleware.model.vo.BedRelativeVO
+import com.wdkl.ncs.android.middleware.model.vo.CustomerInfoVO
+import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
+
+interface BedMomMianFragmentContract {
+
+    interface View : BaseContract.BaseView {
+
+        fun showCustomInfo(customInfo: CustomerInfoVO)
+
+        fun showRelativeInfo(bedRelativeVO: ArrayList<BedRelativeVO>)
+
+        /**
+         * 显示事件数据
+         */
+
+        fun showEvents(data: ArrayList<EventDO>)
+
+        fun setPartSettings(partSetting : PartSettingDO)
+
+        fun loadRoles(roles: List<RoleDO>)
+
+        //显示角色数据
+        fun showRoleData(data: InteractionVO)
+    }
+
+    interface Presenter : BaseContract.BasePresenter {
+
+        //获取病人信息
+        fun loadCustomInfo(customId: Int)
+        //获取亲属信息
+        fun getRelativeList(memberId: Int)
+        //获取右侧按键事件数据
+        fun loadEventList(partId: Int)
+        //获取设置参数
+        fun loadPartSettings(partId: Int)
+
+        //查询角色列表
+        fun getRoleList()
+        //获取角色数据
+        fun getRoleData(frame_id:Int,role_id:Int)
+
+    }
+}

+ 14 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/callingbed/VoiceFragmentContract.kt

@@ -0,0 +1,14 @@
+package com.wdkl.ncs.android.middleware.logic.contract.callingbed
+
+import com.wdkl.ncs.android.lib.base.BaseContract
+import okhttp3.MultipartBody
+
+interface VoiceFragmentContract {
+    interface View : BaseContract.BaseView {
+        fun uploadResponse(result: String)
+    }
+
+    interface Presenter : BaseContract.BasePresenter {
+        fun uploadVoiceMsg(multipart : MultipartBody.Part)
+    }
+}

+ 14 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/callingbed/VoicePlayFragmentContract.kt

@@ -0,0 +1,14 @@
+package com.wdkl.ncs.android.middleware.logic.contract.callingbed
+
+import com.wdkl.ncs.android.lib.base.BaseContract
+import okhttp3.MultipartBody
+
+interface VoicePlayFragmentContract {
+    interface View : BaseContract.BaseView {
+
+    }
+
+    interface Presenter : BaseContract.BasePresenter {
+
+    }
+}

+ 77 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/callingbed/BedMomCallFragmentPresenter.kt

@@ -0,0 +1,77 @@
+package com.wdkl.ncs.android.middleware.logic.presenter.callingbed
+
+import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
+import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
+import com.enation.javashop.net.engine.utils.ThreadFromUtils
+import com.google.gson.FieldNamingPolicy
+import com.google.gson.GsonBuilder
+import com.wdkl.ncs.android.lib.base.RxPresenter
+import com.wdkl.ncs.android.lib.utils.ConnectionObserver
+import com.wdkl.ncs.android.lib.utils.getJsonString
+import com.wdkl.ncs.android.middleware.api.BedDeviceApi
+import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
+import com.wdkl.ncs.android.middleware.logic.contract.callingbed.BedMomCallFragmentContract
+import com.wdkl.ncs.android.middleware.logic.contract.callingbed.BedYhFragmentContract
+import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.YhFragmentContract
+import com.wdkl.ncs.android.middleware.model.dos.EventDO
+import com.wdkl.ncs.android.middleware.model.vo.CallRecordVO
+import io.reactivex.disposables.Disposable
+import javax.inject.Inject
+
+class BedMomCallFragmentPresenter @Inject constructor() : RxPresenter<BedMomCallFragmentContract.View>(), BedMomCallFragmentContract.Presenter {
+    /**
+     * @Name  CallRecordsFragmentApi
+     * @Type  CallRecordsFragmentApi
+     * @Note  通话记录Api
+     */
+
+    @Inject
+    protected lateinit var bedDeviceApi : BedDeviceApi
+
+    override fun bindDagger() {
+        MiddlewareDaggerComponent.component.inject(this)
+    }
+
+    /**
+     * @Name  observer
+     * @Type  ConnectionObserver
+     * @Note  数据监听者
+     */
+    private val observer = object : ConnectionObserver<Any>() {
+        override fun onStartWithConnection() {
+            providerView()
+        }
+
+        override fun onNextWithConnection(result: Any, connectionQuality: ConnectionQuality) {
+            providerView().complete()
+            when (result) {
+                is CallRecordVO -> {
+                    //呼叫记录
+                    providerView().showCallRecords(result)
+                }
+            }
+        }
+
+        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
+            providerView().onError(error.customMessage)
+        }
+
+        override fun attachSubscribe(var1: Disposable) {
+            addDisposable(var1)
+        }
+    }
+
+    override fun loadCallRecords(page_no: Int, page_size: Int, customer_id: Int) {
+        bedDeviceApi.getCallRecords(page_no, page_size, customer_id)
+                .map {
+                    val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                    val records = gson.fromJson(it.getJsonString(), CallRecordVO::class.java)
+
+                    return@map records
+                }
+                .compose(ThreadFromUtils.defaultSchedulers())
+                .subscribe(observer)
+    }
+
+
+}

+ 229 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/callingbed/BedMomMianFragmentPresenter.kt

@@ -0,0 +1,229 @@
+package com.wdkl.ncs.android.middleware.logic.presenter.callingbed
+
+import android.text.TextUtils
+import android.util.Log
+import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
+import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
+import com.enation.javashop.net.engine.utils.ThreadFromUtils
+import com.google.gson.FieldNamingPolicy
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import com.wdkl.ncs.android.lib.base.RxPresenter
+import com.wdkl.ncs.android.lib.utils.ConnectionObserver
+import com.wdkl.ncs.android.lib.utils.getJsonString
+import com.wdkl.ncs.android.middleware.api.BedDeviceApi
+import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
+import com.wdkl.ncs.android.middleware.logic.contract.callingbed.BedMomMianFragmentContract
+import com.wdkl.ncs.android.middleware.model.dos.EventDO
+import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
+import com.wdkl.ncs.android.middleware.model.dos.RoleDO
+import com.wdkl.ncs.android.middleware.model.vo.BedRelativeVO
+import com.wdkl.ncs.android.middleware.model.vo.CustomerInfoVO
+import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
+import io.reactivex.disposables.Disposable
+import javax.inject.Inject
+
+class BedMomMianFragmentPresenter @Inject constructor() : RxPresenter<BedMomMianFragmentContract.View>(), BedMomMianFragmentContract.Presenter {
+
+    @Inject
+    protected lateinit var bedDeviceApi : BedDeviceApi
+
+    override fun bindDagger() {
+        MiddlewareDaggerComponent.component.inject(this)
+    }
+
+    /**
+     * @Name  observer
+     * @Type  ConnectionObserver
+     * @Note  数据监听者
+     */
+    private val observer = object : ConnectionObserver<Any>() {
+        override fun onStartWithConnection() {
+            providerView().start()
+        }
+
+        override fun onNextWithConnection(result: Any, connectionQuality: ConnectionQuality) {
+            providerView().complete()
+            when (result) {
+                is CustomerInfoVO -> {
+                    providerView().showCustomInfo(result)
+                }
+                is PartSettingDO -> {
+                    //设置参数
+                    providerView().setPartSettings(result)
+                }
+                is InteractionVO -> {
+                    //设置参数
+                    providerView().showRoleData(result as InteractionVO)
+                }
+                is List<*> -> {
+                    providerView().showEvents(result as ArrayList<EventDO>)
+                }
+            }
+        }
+
+        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
+            providerView().onError(error.customMessage)
+        }
+
+        override fun attachSubscribe(var1: Disposable) {
+            addDisposable(var1)
+        }
+
+
+        override fun onNoneNet() {
+            Log.d("MainFragmentPresenter", "onNoneNet...")
+            super.onNoneNet()
+        }
+    }
+
+
+    /**
+     * @Name  observer
+     * @Type  ConnectionObserver
+     * @Note  数据监听者
+     */
+    private val observer2 = object : ConnectionObserver<Any>() {
+        override fun onStartWithConnection() {
+            providerView().start()
+        }
+
+        override fun onNextWithConnection(result: Any, connectionQuality: ConnectionQuality) {
+            providerView().complete()
+            when (result) {
+                is List<*> -> {
+                    providerView().showRelativeInfo(result as ArrayList<BedRelativeVO>)
+                }
+
+            }
+        }
+
+        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
+            providerView().onError(error.customMessage)
+        }
+
+        override fun attachSubscribe(var1: Disposable) {
+            addDisposable(var1)
+        }
+
+
+        override fun onNoneNet() {
+            Log.d("MainFragmentPresenter", "onNoneNet...")
+            super.onNoneNet()
+        }
+    }
+    /**
+     * @Name  observer
+     * @Type  ConnectionObserver
+     * @Note  数据监听者
+     */
+    private val observer3 = object : ConnectionObserver<Any>() {
+        override fun onStartWithConnection() {
+            providerView().start()
+        }
+
+        override fun onNextWithConnection(result: Any, connectionQuality: ConnectionQuality) {
+            providerView().complete()
+            when (result) {
+                is List<*> -> {
+                    providerView().loadRoles(result as List<RoleDO>)
+                }
+
+            }
+        }
+
+        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
+            providerView().onError(error.customMessage)
+        }
+
+        override fun attachSubscribe(var1: Disposable) {
+            addDisposable(var1)
+        }
+
+
+        override fun onNoneNet() {
+            Log.d("MainFragmentPresenter", "onNoneNet...")
+            super.onNoneNet()
+        }
+    }
+
+
+    override fun loadCustomInfo(customId: Int) {
+        bedDeviceApi.getCustomInfo(customId)
+                .map {
+                    val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                    val customerInfoVO = gson.fromJson(it.getJsonString(), CustomerInfoVO::class.java)
+
+                    return@map customerInfoVO
+                }
+                .compose(ThreadFromUtils.defaultSchedulers())
+                .subscribe(observer)
+    }
+
+    override fun getRelativeList(memberId: Int) {
+        bedDeviceApi.getRelativeList(memberId)
+                .map {
+                    val data = it.getJsonString()
+                    val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                    val itemType = object : TypeToken<ArrayList<BedRelativeVO>>(){}.type
+                    val List =  gson.fromJson<ArrayList<EventDO>>(data, itemType)
+
+                    return@map List
+                }
+                .compose(ThreadFromUtils.defaultSchedulers())
+                .subscribe(observer2)
+    }
+
+    override fun loadEventList(partId: Int) {
+        bedDeviceApi.getEventList(partId)
+                .map {
+                    val data = it.getJsonString()
+                    val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                    val itemType = object : TypeToken<ArrayList<EventDO>>(){}.type
+                    val eventList = gson.fromJson<ArrayList<EventDO>>(data, itemType)
+
+                    return@map eventList
+                }
+                .compose(ThreadFromUtils.defaultSchedulers())
+                .subscribe(observer)
+    }
+
+    override fun loadPartSettings(partId: Int) {
+        bedDeviceApi.getPartSettings(partId)
+                .map {
+                    val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                    val settings = gson.fromJson(it.getJsonString(), PartSettingDO::class.java)
+
+                    return@map settings
+                }
+                .compose(ThreadFromUtils.defaultSchedulers())
+                .subscribe(observer)
+    }
+
+    override fun getRoleList() {
+        bedDeviceApi.getRoleList()
+                .map {
+                    val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                    val settings = gson.fromJson<List<RoleDO>>(it.getJsonString(),
+                            object : TypeToken<ArrayList<RoleDO?>?>() {}.type)
+                    Log.i("加载角色", settings.toString())
+                    return@map settings
+                }.compose(ThreadFromUtils.defaultSchedulers())
+                .subscribe(observer3)
+    }
+
+    override fun getRoleData(frame_id: Int, role_id: Int) {
+        bedDeviceApi.getRoleData(frame_id,role_id).map {
+            var interactionVO = InteractionVO()
+
+            var gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+            if(!TextUtils.isEmpty(it.getJsonString())){
+                interactionVO = gson.fromJson(it.getJsonString(), InteractionVO::class.java)
+            }
+            return@map interactionVO
+        }.compose(ThreadFromUtils.defaultSchedulers())
+                .subscribe(observer)
+    }
+
+
+}

+ 0 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/callingbed/VoiceFragmentPresenter.kt


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor