新增rk3288_ym型号21.5寸竖屏分机适配

android_bed/build.gradle

@@ -56,6 +56,7 @@ android {
             dimension "app"
             buildConfigField 'String', 'flag', '"2"'
         }
+
         //外购 大朝华7寸
         dch_7 {
             dimension "app"
@@ -92,6 +93,11 @@ android {
             dimension "app"
             buildConfigField 'String', 'flag', '"11"'
         }
+
+        rk3288_ym {//外购21.5寸竖屏分机
+            dimension "app"
+            buildConfigField 'String', 'flag', '"12"'
+        }
     }
     sourceSets {
         main { jni.srcDirs = [] }
@@ -129,6 +135,9 @@ android {
             manifest.srcFile 'src/main/sharedUserId/AndroidManifest.xml'
         }
 
+        rk3288_ym {//外购21.5寸竖屏分机
+            manifest.srcFile 'src/main/AndroidManifest.xml'
+        }
 
 
     }

android_bed/src/main/AndroidManifest.xml

@@ -26,6 +26,15 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.REBOOT"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+    <uses-permission android:name="android.permission.DEVICE_POWER"/>
+    <uses-permission android:name="android.permission.SHUTDOWN"/>
+    <uses-permission android:name="android.permission.SET_TIME"/>
+
     <!-- Needed for full screen intent in incoming call notifications -->
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
 

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

@@ -369,7 +369,7 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
 
         if ("rk3128".equals(Build.MODEL)) {
             checkLaunch()
-        }else{
+        } else {
             startYunpaiPlugin()
         }
         SpeechUtil.getInstance().init(applicationContext)
@@ -869,10 +869,13 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
         //获取APP版本信息，7寸分机type=204，8寸可视分机用104
         if (Constant.PART_ID != null) {
             //判断是不是探视分机 ，伊莱顿类型分机主要用在探视分机，在后台更新项也必须添加到可视类型
-         if (BuildConfig.flag == Constant.DEV_W_YLD) {
-             presenter.getAppVersion(Constant.PART_ID, 104)
+            if (BuildConfig.flag == Constant.DEV_W_YLD
+                || BuildConfig.flag == Constant.DEV_W_DCH
+                || BuildConfig.flag == Constant.DEV_W_ZX_8
+            ) {
+                presenter.getAppVersion(Constant.PART_ID, 104)
             } else {
-             presenter.getAppVersion(Constant.PART_ID, 204)
+                presenter.getAppVersion(Constant.PART_ID, 204)
             }
         }
         Log.d("AppUpdate", "checkAppVersion =====>>  Constant.PART_ID: " + Constant.PART_ID)
@@ -3264,6 +3267,7 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
             e.printStackTrace()
         }
     }
+
     private fun startYunpaiPlugin() {
         try {
             val packageInfos = packageManager.getInstalledPackages(

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

@@ -161,6 +161,37 @@ class DeviceSystemActivity : BaseActivity<BedTextActivityPresenter, CallingbedDe
         view_title_layout_img.visibility = View.VISIBLE
         view_title_layout_tv_no.visibility =View.VISIBLE
         view_title_layout_tv_no.setText(R.string.device_config)
+
+        //网络图标
+        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_success)
+        }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)
+        }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.ic_bt_success)
+        }
+        //白天/黑夜
+        if (Constant.day_state == 0){
+            view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_daylight)
+        }else{
+            view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_night)
+        }
+
+        if (Constant.TCP_CONNECTED) {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_success)
+        } else {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_nor)
+        }
     }
 
 

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

@@ -10,6 +10,7 @@ import com.enation.javashop.net.engine.model.NetState
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.adapter.TipsMianAdapter
 import com.wdkl.app.ncs.callingbed.databinding.CallingbedNurseMsgBinding
+import com.wdkl.app.ncs.callingbed.helper.Utils
 import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
 import com.wdkl.app.ncs.callingbed.utils.SPUtils
 import com.wdkl.ncs.android.lib.base.BaseActivity
@@ -77,6 +78,29 @@ class SetHintActivity : BaseActivity<SetHintActivityPresenter, CallingbedNurseMs
     }
 
     override fun bindEvent() {
+        rl_msg_title.setOnClickListener {
+            try {
+                Utils.hideInputKeyboard(activity.window!!.decorView.windowToken)
+            } catch (e: Exception) {
+                //
+            }
+        }
+
+        rl_msg_content.setOnClickListener {
+            try {
+                Utils.hideInputKeyboard(activity.window!!.decorView.windowToken)
+            } catch (e: Exception) {
+                //
+            }
+        }
+
+        rl_msg_time.setOnClickListener {
+            try {
+                Utils.hideInputKeyboard(activity.window!!.decorView.windowToken)
+            } catch (e: Exception) {
+                //
+            }
+        }
 
         nurse_msg_tx_5.setOnClickListener {
             showbtui(false)
@@ -280,7 +304,7 @@ class SetHintActivity : BaseActivity<SetHintActivityPresenter, CallingbedNurseMs
     }
 
     override fun showTips(advices: ArrayList<TipsVO>) {
-        if (advices != null) {
+        if (advices.size > 0) {
             rv_tips_main_view.visibility = View.VISIBLE
             nurse_msg_tx_rl.visibility = View.GONE
             allOrders.clear()

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

@@ -257,7 +257,13 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingbedSettingMa
         }else{
             view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_night)
         }
-        view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_success)
+
+        if (Constant.TCP_CONNECTED) {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_success)
+        } else {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_nor)
+        }
+
         //设置二维码
         setQrcode()
 

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

@@ -53,18 +53,22 @@ class TextActivity : BaseActivity<BedTextActivityPresenter, CallingbedTestMainBi
     override fun init() {
         Constant.isText=true
 
-        LinphoneManager.sipTesting = true
-        linphoneManager = LinphoneManager.getInstance(BaseApplication.appContext)
-
         showui()
         RecordHelper.getInstance().init()
         if (SettingConfig.getSipEnabled(this)) {
+            ll_sip_config_view.visibility = View.VISIBLE
+
+            linphoneManager = LinphoneManager.getInstance(BaseApplication.appContext)
+            LinphoneManager.sipTesting = true
+
             val core = linphoneManager?.getCore()
             if (core?.identity.equals("") || core?.identity==null ){
                 password_ed.hint =  "No sipId"
             }else{
                 password_ed.hint = core.identity
             }
+        } else {
+            ll_sip_config_view.visibility = View.GONE
         }
 
         //摄像头调用  暂无
@@ -141,6 +145,36 @@ class TextActivity : BaseActivity<BedTextActivityPresenter, CallingbedTestMainBi
         lycs_button.setBackgroundResource(R.drawable.shape_main_hos_txt_bg)
         lycs_img.visibility=View.INVISIBLE
 
+        //网络图标
+        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_success)
+        }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)
+        }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.ic_bt_success)
+        }
+        //白天/黑夜
+        if (Constant.day_state == 0){
+            view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_daylight)
+        }else{
+            view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_night)
+        }
+
+        if (Constant.TCP_CONNECTED) {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_success)
+        } else {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_nor)
+        }
 
     }
     //麦克风

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/adapter/EventsMenuapter.kt

@@ -1,6 +1,7 @@
 package com.wdkl.app.ncs.callingbed.adapter
 
 import android.content.Context
+import android.text.TextUtils
 
 import android.view.LayoutInflater
 import android.view.View
@@ -51,17 +52,20 @@ class EventsMenuapter : RecyclerView.Adapter<EventsMenuapter.ViewHolder>{
         if ( data.get(position).name!=null){
             holder.textView.text = data.get(position).name
         }
-        if (data.get(position).iconSrc!=null && !data.get(position).iconSrc.equals("")){
+
+        if (!TextUtils.isEmpty(data.get(position).iconSrc)){
             Glide.with(holder.imageView.context)
-                    .load( data.get(position).iconSrc)
-                    .diskCacheStrategy(DiskCacheStrategy.ALL)
-                    .into(holder.imageView)
-        }else{
-            holder.imageView.visibility=View.INVISIBLE
+                .load(data.get(position).iconSrc)
+                .placeholder(R.mipmap.hs_img)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .into(holder.imageView)
+        } else {
+            //holder.imageView.visibility=View.INVISIBLE
+            holder.imageView.setImageResource(R.mipmap.hs_img)
         }
+
         holder.actionView.setOnClickListener {
             onItemClickListener.onItemClick(holder.itemView, position)
-//            onItemClickListener?.onItemClick(holder.itemView, data?.get(position).id)
         }
     }
 

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/di/CallingbedComponent.kt

@@ -118,4 +118,6 @@ interface CallingbedComponent {
     fun inject(fragment: DormLightSetFragment)
 
     fun inject(fragment: DormReceptacleSetFragment)
+
+    fun inject(fragment: DormCurtainSetFragment)
 }

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/CallConfigDialogHelper.java

@@ -101,7 +101,7 @@ public class CallConfigDialogHelper {
                 Window window = alertDialog.getWindow();
                 WindowManager.LayoutParams lp = window.getAttributes();
                 lp.width = 800;
-                lp.height = 450;
+                lp.height = 760;
                 lp.gravity = Gravity.CENTER;
                 window.setAttributes(lp);
             } catch (Exception e) {

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/CallTypeDialogHelper.java

@@ -2,8 +2,13 @@ package com.wdkl.app.ncs.callingbed.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;
 
@@ -49,6 +54,23 @@ public class CallTypeDialogHelper {
         alertDialog.setCanceledOnTouchOutside(true);
         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 = 760;
+                lp.gravity = Gravity.CENTER;
+                window.setAttributes(lp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     public interface ClickListener{

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/Device433DialogHelper.java

@@ -2,9 +2,14 @@ package com.wdkl.app.ncs.callingbed.dialog;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.res.Configuration;
 import android.os.Handler;
+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.ImageView;
 import android.widget.TextView;
@@ -83,6 +88,23 @@ public class Device433DialogHelper {
 //            handler.removeCallbacks(runnable);
         });
 
+        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 = 760;
+                lp.gravity = Gravity.CENTER;
+                window.setAttributes(lp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
 //        handler.postDelayed(runnable, countdownTime);
     }
 }

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/DeviceLinkDialogHelper.java

@@ -94,7 +94,7 @@ public class DeviceLinkDialogHelper {
                 Window window = alertDialog.getWindow();
                 WindowManager.LayoutParams lp = window.getAttributes();
                 lp.width = 800;
-                lp.height = 650;
+                lp.height = 760;
                 lp.gravity = Gravity.CENTER;
                 window.setAttributes(lp);
             } catch (Exception e) {

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/DeviceLinkSleepDialogHelper.java

@@ -77,7 +77,7 @@ public class DeviceLinkSleepDialogHelper {
                 Window window = linkalertDialog.getWindow();
                 WindowManager.LayoutParams lp = window.getAttributes();
                 lp.width = 800;
-                lp.height = 650;
+                lp.height = 760;
                 lp.gravity = Gravity.CENTER;
                 window.setAttributes(lp);
             } catch (Exception e) {

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/ExitHuliDialogHelper.java

@@ -2,8 +2,13 @@ package com.wdkl.app.ncs.callingbed.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,22 @@ 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();

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/HuliDialogHelper.java

@@ -2,8 +2,13 @@ package com.wdkl.app.ncs.callingbed.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;
 
@@ -45,6 +50,22 @@ public class HuliDialogHelper {
         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();

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/HuliTiemDialogHelper.java

@@ -96,7 +96,7 @@ public class HuliTiemDialogHelper {
                 Window window = alertDialog.getWindow();
                 WindowManager.LayoutParams lp = window.getAttributes();
                 lp.width = 800;
-                lp.height = 650;
+                lp.height = 760;
                 lp.gravity = Gravity.CENTER;
                 window.setAttributes(lp);
             } catch (Exception e) {

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/Network2DialogHelper.java

@@ -101,7 +101,7 @@ public class Network2DialogHelper {
                 Window window = alertDialog.getWindow();
                 WindowManager.LayoutParams lp = window.getAttributes();
                 lp.width = 800;
-                lp.height = 650;
+                lp.height = 760;
                 lp.gravity = Gravity.CENTER;
                 window.setAttributes(lp);
             } catch (Exception e) {

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/NetworkDialogHelper.java

@@ -93,7 +93,7 @@ public class NetworkDialogHelper {
                 Window window = alertDialog.getWindow();
                 WindowManager.LayoutParams lp = window.getAttributes();
                 lp.width = 800;
-                lp.height = 650;
+                lp.height = 760;
                 lp.gravity = Gravity.CENTER;
                 window.setAttributes(lp);
             } catch (Exception e) {

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/PatrolDialogHelper.java

@@ -2,8 +2,13 @@ package com.wdkl.app.ncs.callingbed.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;
 
@@ -41,6 +46,22 @@ public class PatrolDialogHelper {
         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();

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/PositioningDialogHelper.java

@@ -2,8 +2,13 @@ package com.wdkl.app.ncs.callingbed.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;
 
@@ -44,6 +49,22 @@ public class PositioningDialogHelper {
         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();

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/ReinforcementsDialogHelper.java

@@ -2,9 +2,14 @@ package com.wdkl.app.ncs.callingbed.dialog;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.res.Configuration;
 import android.os.Handler;
+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.ImageView;
 import android.widget.TextView;
@@ -74,6 +79,23 @@ public class ReinforcementsDialogHelper {
             handler.removeCallbacks(runnable);
         });
 
+        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();
+            }
+        }
+
         handler.postDelayed(runnable, countdownTime);
     }
 

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

@@ -79,7 +79,7 @@ public class ServicesDialogHelper {
                 Window window = alertDialog.getWindow();
                 WindowManager.LayoutParams lp = window.getAttributes();
                 lp.width = 800;
-                lp.height = 650;
+                lp.height = 760;
                 lp.gravity = Gravity.CENTER;
                 window.setAttributes(lp);
             } catch (Exception e) {

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/SystemDialogHelper.java

@@ -109,7 +109,7 @@ public class SystemDialogHelper {
                 Window window = alertDialog.getWindow();
                 WindowManager.LayoutParams lp = window.getAttributes();
                 lp.width = 800;
-                lp.height = 650;
+                lp.height = 760;
                 lp.gravity = Gravity.CENTER;
                 window.setAttributes(lp);
             } catch (Exception e) {

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/dialog/WifiSetDialogHelper.java

@@ -2,9 +2,14 @@ package com.wdkl.app.ncs.callingbed.dialog;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.res.Configuration;
 import android.os.Handler;
+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.ImageView;
 import android.widget.TextView;
@@ -74,6 +79,23 @@ public class WifiSetDialogHelper {
             handler.removeCallbacks(runnable);
         });
 
+        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 = 760;
+                lp.gravity = Gravity.CENTER;
+                window.setAttributes(lp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
         handler.postDelayed(runnable, countdownTime);
     }
 }

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

@@ -3,7 +3,6 @@ package com.wdkl.app.ncs.callingbed.fragment
 import android.content.Intent
 import android.text.TextUtils
 import android.view.View
-import androidx.recyclerview.widget.GridLayoutManager
 import com.enation.javashop.net.engine.model.NetState
 
 import com.wdkl.app.ncs.callingbed.R
@@ -30,10 +29,6 @@ import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import com.wdkl.ncs.android.middleware.utils.StringUtil
 import kotlinx.android.synthetic.main.main_view3_layout.*
 import kotlinx.android.synthetic.main.main_view_layout.*
-import kotlinx.android.synthetic.main.main_view_layout.image_qr_code
-import kotlinx.android.synthetic.main.main_view_layout.ll_qr_code
-import kotlinx.android.synthetic.main.sleep_activity.*
-import kotlinx.android.synthetic.main.view_bed_name.tv_bed_name
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode

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

@@ -1,8 +1,10 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
+import android.content.res.Configuration
 import android.util.Log
 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
@@ -255,7 +257,13 @@ class CallRecordsFragment : BaseFragment<BedCallRecordsFragmentPresenter, MainCa
             }
             deviceMenuapter = EventsMenuapter(activity, allOrders)
             deviceMenuapter.setOnItemClickListener(this)
+            val layoutManager = LinearLayoutManager(activity)
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                layoutManager.orientation = LinearLayoutManager.HORIZONTAL
+            }
             main_call_r_l_rv_1.adapter = deviceMenuapter
+            main_call_r_l_rv_1.layoutManager = layoutManager
             deviceMenuapter.updateData(allOrders)
         }
     }
@@ -295,7 +303,11 @@ class CallRecordsFragment : BaseFragment<BedCallRecordsFragmentPresenter, MainCa
             val tcpModel = EventUtil.eventKeyClick(Constant.DEVICE_ID, allOrders.get(keyId).id)
             val transaction: TcpCallback = object : TcpCallback(tcpModel.tid) {
                 override fun onAck() {
-                    //事件发送成功
+                    //事件发送到服务器成功
+                }
+                override fun onSuccess(jsonObject: JSONObject) {
+                    //目标设备已接收
+                    Log.d(TAG, "target received event")
                     if (Locale.CHINESE.getLanguage().equals(language)) {
                         SpeechUtil.getInstance().stopSpeak()
                         SpeechUtil.getInstance().speak("已发送" + allOrders.get(keyId).name + "事件//请耐心等待")
@@ -313,10 +325,6 @@ class CallRecordsFragment : BaseFragment<BedCallRecordsFragmentPresenter, MainCa
                         }
                     }
                 }
-                override fun onSuccess(jsonObject: JSONObject) {
-                    //对方已接收
-                    Log.d(TAG, "target received event")
-                }
 
                 override fun onFailed(jsonObject: JSONObject) {
                     // 这里写发送失败的方法

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

@@ -1,5 +1,6 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
+import android.content.res.Configuration
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
@@ -56,6 +57,10 @@ class  MainFragment: BaseFragment<BedMainFragmentPresenter, MainViewLayoutBindin
 
     override fun init() {
         val layoutManager = GridLayoutManager(getActivity(), 3)
+        val orientation = activity.resources.configuration.orientation
+        if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+            layoutManager.spanCount = 2
+        }
         rv_main_view.setLayoutManager(layoutManager)
 
         //删除本地原来的入住信息

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

@@ -1,6 +1,7 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.CountDownTimer
 
 import android.util.Log
@@ -53,6 +54,11 @@ class NursingWorkFragment : BaseFragment<BedNursingWorkFragmentPresenter, Nursin
     //数据绑定
     override fun init() {
         val layoutManager = GridLayoutManager(getActivity(), 3)
+        val orientation = activity.resources.configuration.orientation
+        if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+            layoutManager.spanCount = 2
+        }
+
         recycler.visibility = View.VISIBLE
         recycler.layoutManager = layoutManager
 

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

@@ -166,7 +166,11 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
         //初始化 engine
         if (Constant.CALL_TYPE == Constant.VIDEO_CALL) {
             audioCall = false
-            WebRTCEngine.getInstance().init(false, this.context)
+            if (Constant.supportCamera) {
+                WebRTCEngine.getInstance().init(false, this.context)
+            } else {
+                WebRTCEngine.getInstance().init(true, this.context)
+            }
         } else {
             audioCall = true
             WebRTCEngine.getInstance().init(true, this.context)

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

@@ -1,15 +1,15 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
 
+import android.content.res.Configuration
 import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 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.adapter.SignMianAdapter
 import com.wdkl.app.ncs.callingbed.adapter.YhMianAdapter
 import com.wdkl.app.ncs.callingbed.databinding.CallingbedNurseBinding
+import com.wdkl.app.ncs.callingbed.helper.Utils
 import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
 import com.wdkl.app.ncs.callingbed.utils.SPUtils
 import com.wdkl.ncs.android.lib.base.BaseFragment
@@ -20,10 +20,7 @@ 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.model.vo.DeviceMenulist
-import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil
 import com.wdkl.ncs.android.middleware.tcp.channel.YhUtil
-import kotlinx.android.synthetic.main.activity_sign.*
 import kotlinx.android.synthetic.main.callingbed_nurse.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -57,6 +54,10 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingbedNurseBinding>(),
         rv_nurse_main_ll.visibility = View.GONE
         adapter = YhMianAdapter(activity, ArrayList())
         val layoutManager = GridLayoutManager(activity, 4, LinearLayoutManager.VERTICAL, false)
+        val orientation = activity.resources.configuration.orientation
+        if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+            layoutManager.spanCount = 2
+        }
         rv_nurse_main_view.layoutManager = layoutManager
         adapter.setOnItemClickListener(this)
         rv_nurse_main_view.adapter = adapter
@@ -74,8 +75,12 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingbedNurseBinding>(),
                 } else {
                     showMessage("no part id")
                 }
+            }
 
-
+            try {
+                Utils.hideInputKeyboard(activity.window!!.decorView.windowToken)
+            } catch (e: Exception) {
+                //
             }
         }
 
@@ -83,8 +88,8 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingbedNurseBinding>(),
             if (!passno.equals("")){
                 YhUtil.sendLanding(Constant.DEVICE_ID, passno)
 //                (activity as CallingbedActivity).addNurseFragment()
-                SPUtils.put(getActivity(), Constant.YH_NO, passno);
-                SPUtils.put(getActivity(), Constant.YH_NAME, yh_name);
+                SPUtils.put(getActivity(), Constant.YH_NO, passno)
+                SPUtils.put(getActivity(), Constant.YH_NAME, yh_name)
             }else{
                 showMessage(R.string.str_empty_card_no)
             }

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/hardware/HardWareFactory.java

@@ -3,7 +3,9 @@ package com.wdkl.app.ncs.callingbed.hardware;
 
 import com.wdkl.app.ncs.callingbed.BuildConfig;
 import com.wdkl.app.ncs.callingbed.hardware.imp.A133HardTools;
+import com.wdkl.app.ncs.callingbed.hardware.imp.CommonHardTools;
 import com.wdkl.app.ncs.callingbed.hardware.imp.PWHardTools;
+import com.wdkl.app.ncs.callingbed.hardware.imp.RK3288YMHardTools;
 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;
@@ -24,18 +26,22 @@ public  class HardWareFactory {
                 hardTools = Z3128HardTools.getInstance();
             } else if(BuildConfig.flag.equals(Constant.DEV_W_DCH)) {
                 hardTools = WdchHardTools.getInstance();
-            } else if (BuildConfig.flag.equals(Constant.DEV_W_YLD)) {
+            } else if(BuildConfig.flag.equals(Constant.DEV_W_YLD)) {
                 hardTools = YldHardTools.getInstance();
             } else if(BuildConfig.flag.equals(Constant.DEV_W_A133)){
                 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)) {
+            } else if(BuildConfig.flag.equals(Constant.DEV_W_KAER)) {
                 hardTools = new ZKEHardTools();
-            }else if(BuildConfig.flag.equals(Constant.DEV_W_PW_10)) {
+            } else if(BuildConfig.flag.equals(Constant.DEV_W_PW_10)) {
                 hardTools = new PWHardTools();
-            }else if(BuildConfig.flag.equals(Constant.DEV_W_DCHK_10)) {
+            } else if(BuildConfig.flag.equals(Constant.DEV_W_DCHK_10)) {
                 hardTools = new PWHardTools();
+            } else if (BuildConfig.flag.equals(Constant.DEV_W_RK3288_YM)) {
+                hardTools = RK3288YMHardTools.getInstance();
+            } else {
+                hardTools = CommonHardTools.getInstance();
             }
         }
         return hardTools ;

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/hardware/imp/CommonHardTools.java

@@ -0,0 +1,98 @@
+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.text.TextUtils;
+import android.util.Log;
+
+import com.wdkl.app.ncs.callingbed.activity.AppUpdateActivity;
+import com.wdkl.app.ncs.callingbed.activity.CallingbedActivationActivity;
+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.ncs.android.middleware.common.Constant;
+import com.wdkl.ncs.android.middleware.utils.AppUtil;
+
+import java.util.List;
+
+public class CommonHardTools extends HardTools {
+
+
+    private static class CommonHardToolsHolder{
+        private final  static CommonHardTools cHardTools = new CommonHardTools();
+    }
+
+    public static CommonHardTools getInstance(){
+        return CommonHardToolsHolder.cHardTools;
+    }
+
+    @Override
+    public void init(CallingbedActivationActivity callingbedActivationActivity) {
+
+    }
+
+    @Override
+    public void unInit() {
+
+    }
+
+    @Override
+    public void resetDevice() {
+
+    }
+    @Override
+    public void setTime(Context context, long timeMills, String timeZone) {
+        super.setTime(context, timeMills, timeZone);
+    }
+    @Override
+    public void resetDevicex(Application application) {
+        AppUpdateHelper.reboot(application);
+    }
+    @Override
+    public void Registration(Context context) {
+        //获取mac地址
+        Constant.LOCAL_MAC = NetHelper.getInstance().getMacAddress();
+        Constant.DEVICE_SN = NetHelper.getInstance().getIMEI();
+
+        if (!TextUtils.isEmpty(Constant.DEVICE_SN) && !Constant.DEVICE_SN.equalsIgnoreCase("null")) {
+            Constant.DEVICE_REGISTER_ID = Constant.DEVICE_SN;
+        } else {
+            Constant.DEVICE_REGISTER_ID = Constant.LOCAL_MAC;
+        }
+    }
+
+    @Override
+    public void startbar(Boolean is) {
+        super.startbar(is);
+    }
+    @Override
+    public void uninstallApp(Context context, boolean isuninstall, String name) {
+
+    }
+
+    @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;
+    }
+}

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/hardware/imp/RK3288YMHardTools.java

@@ -0,0 +1,103 @@
+package com.wdkl.app.ncs.callingbed.hardware.imp;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.wdkl.app.ncs.callingbed.activity.AppUpdateActivity;
+import com.wdkl.app.ncs.callingbed.activity.CallingbedActivationActivity;
+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.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.middleware.common.Constant;
+
+import java.util.List;
+
+public class RK3288YMHardTools extends HardTools {
+
+
+    private static class RK3288YMHardToolsHolder{
+        private final  static RK3288YMHardTools cHardTools = new RK3288YMHardTools();
+    }
+
+    public static RK3288YMHardTools getInstance(){
+        return RK3288YMHardToolsHolder.cHardTools;
+    }
+
+    @Override
+    public void init(CallingbedActivationActivity callingbedActivationActivity) {
+
+    }
+
+    @Override
+    public void unInit() {
+
+    }
+
+    @Override
+    public void resetDevice() {
+
+    }
+    @Override
+    public void setTime(Context context, long timeMills, String timeZone) {
+        super.setTime(context, timeMills, timeZone);
+    }
+    @Override
+    public void resetDevicex(Application application) {
+        AppUpdateHelper.reboot(application);
+    }
+    @Override
+    public void Registration(Context context) {
+        //获取mac地址
+        Constant.LOCAL_MAC = NetHelper.getInstance().getMacAddress();
+        Constant.DEVICE_SN = NetHelper.getInstance().getIMEI();
+
+        if (!TextUtils.isEmpty(Constant.DEVICE_SN) && !Constant.DEVICE_SN.equalsIgnoreCase("null")) {
+            Constant.DEVICE_REGISTER_ID = Constant.DEVICE_SN;
+        } else {
+            Constant.DEVICE_REGISTER_ID = Constant.LOCAL_MAC;
+        }
+    }
+
+    @Override
+    public void startbar(Boolean is) {
+        /*Intent intent = new Intent();
+        intent.setAction("com.konka.action.NAVI_BAR_VISIBLE_CHANGE");
+        intent.putExtra("nav", is);
+        BaseApplication.appContext.sendBroadcast(intent);*/
+
+        super.startbar(is);
+    }
+    @Override
+    public void uninstallApp(Context context, boolean isuninstall, String name) {
+
+    }
+
+    @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;
+    }
+}

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/helper/UpdateTipsDialogHelper.java

@@ -3,7 +3,9 @@ package com.wdkl.app.ncs.callingbed.helper;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.CountDownTimer;
+import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -87,15 +89,32 @@ public class UpdateTipsDialogHelper {
         dialog.show();
 
         //设置dialog宽高及位置
-        try {
-            Window window = dialog.getWindow();
-            WindowManager.LayoutParams lp = window.getAttributes();
-            lp.width = WindowManager.LayoutParams.WRAP_CONTENT;
-            lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            lp.gravity = Gravity.CENTER;
-            window.setAttributes(lp);
-        } catch (Exception e) {
-            e.printStackTrace();
+        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 = dialog.getWindow();
+                WindowManager.LayoutParams lp = window.getAttributes();
+                lp.width = 800;
+                lp.height = 760;
+                lp.gravity = Gravity.CENTER;
+                window.setAttributes(lp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else {
+            try {
+                Window window = dialog.getWindow();
+                WindowManager.LayoutParams lp = window.getAttributes();
+                lp.width = WindowManager.LayoutParams.WRAP_CONTENT;
+                lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                lp.gravity = Gravity.CENTER;
+                window.setAttributes(lp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 }

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/helper/WarningDialogHelper.java

@@ -2,6 +2,8 @@ package com.wdkl.app.ncs.callingbed.helper;
 
 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;
@@ -15,8 +17,8 @@ public class WarningDialogHelper {
     private static AlertDialog dialog;
 
     public static void showDialog(Activity activity) {
-        if (dialog != null && dialog.isShowing()) {
-            return;
+        if (dialog != null) {
+            dialog.dismiss();
         }
 
         View contentView = LayoutInflater.from(activity).inflate(R.layout.warning_dialog_lay, null);
@@ -35,21 +37,38 @@ public class WarningDialogHelper {
         //dialog.setCancelable(false);
         dialog.show();
 
-        //设置dialog宽高及位置
-        try {
-            Window window = dialog.getWindow();
-            WindowManager.LayoutParams lp = window.getAttributes();
-            lp.width = 600;
-            lp.height = 240;
-            lp.gravity = Gravity.CENTER;
-            window.setAttributes(lp);
-        } catch (Exception e) {
-            e.printStackTrace();
+
+        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 = dialog.getWindow();
+                WindowManager.LayoutParams lp = window.getAttributes();
+                lp.width = 800;
+                lp.height = 450;
+                lp.gravity = Gravity.CENTER;
+                window.setAttributes(lp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else {
+            try {
+                Window window = dialog.getWindow();
+                WindowManager.LayoutParams lp = window.getAttributes();
+                lp.width = 600;
+                lp.height = 240;
+                lp.gravity = Gravity.CENTER;
+                window.setAttributes(lp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 
     public static void dismiss() {
-        if (dialog != null && dialog.isShowing()) {
+        if (dialog != null) {
             dialog.dismiss();
         }
     }

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/sip/core/LinphoneManager.kt

@@ -535,7 +535,7 @@ class LinphoneManager private constructor(private val context: Context) {
 
     //设置存放用户x509证书的目录路径
     private fun initUserCertificates() {
-        val userCertsPath = corePreferences!!.userCertificatesPath
+        val userCertsPath = corePreferences.userCertificatesPath
         val f = File(userCertsPath)
         if (!f.exists()) {
             if (!f.mkdir()) {

android_bed/src/main/res/layout-land/callingbed_main_new.xml

@@ -11,7 +11,7 @@
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:layout_marginBottom="@dimen/d20"
-            android:layout_marginTop="@dimen/d8" />
+            android:layout_marginTop="@dimen/d40" />
 
         <!--通话记录界面-->
         <FrameLayout
@@ -204,7 +204,7 @@
                 android:paddingRight="@dimen/d6"
                 android:paddingBottom="@dimen/d20"
                 android:singleLine="true"
-                android:text="@string/str_call_nurse"
+                android:text="@string/str_call"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
         </RelativeLayout>

android_bed/src/main/res/layout-land/callingbed_nurse_main.xml

@@ -14,6 +14,13 @@
             android:layout_marginRight="@dimen/d20"
             android:background="@drawable/shape_bed_bg">
 
+            <ImageView
+                android:layout_width="@dimen/d365"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_marginLeft="25dp"
+                android:src="@mipmap/yihu" />
+
             <TextView
                 android:id="@+id/nurse_main_tx_1"
                 android:layout_width="wrap_content"
@@ -63,13 +70,6 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_15" />
 
-            <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_bed/src/main/res/layout-land/callingbed_nurse_msg.xml

@@ -1,17 +1,19 @@
 <?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">
+        android:background="#F7F7F7"
+        android:orientation="vertical">
+
         <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">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -21,11 +23,11 @@
                     android:id="@+id/msg_view_title_layout_return"
                     android:layout_width="@dimen/d105"
                     android:layout_height="@dimen/d30"
+                    android:layout_centerVertical="true"
                     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
@@ -34,8 +36,8 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="6dp"
-                        android:visibility="gone"
-                        android:background="@mipmap/return_w" />
+                        android:background="@mipmap/return_w"
+                        android:visibility="gone" />
                     <!--医院名称-->
                     <TextView
                         android:id="@+id/msg_view_title_layout_tv_hospital_name"
@@ -45,17 +47,18 @@
                         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_centerVertical="true"
                     android:layout_marginRight="10dp"
                     android:text="ID:"
-                    android:visibility="gone"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_18" />
+                    android:textSize="@dimen/font_size_18"
+                    android:visibility="gone" />
                 <!--状态图标-->
                 <LinearLayout
                     android:id="@+id/msg_view_title_layout_ll_right"
@@ -78,12 +81,12 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="@dimen/d5"
                         android:format12Hour="yyyy-MM-dd EEEE"
                         android:format24Hour="yyyy-MM-dd EEEE"
+                        android:text="16:08"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/font_size_14"
-                        android:layout_marginLeft="@dimen/d5"
-                        android:text="16:08"/>
+                        android:textSize="@dimen/font_size_14" />
 
                     <ImageView
                         android:layout_width="@dimen/d22"
@@ -97,13 +100,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="@dimen/d5"
+                        android:layout_marginRight="@dimen/d15"
                         android:format12Hour="HH:mm"
                         android:format24Hour="HH:mm"
+                        android:text="16:08"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/font_size_14"
-                        android:layout_marginLeft="@dimen/d5"
-                        android:layout_marginRight="@dimen/d15"
-                        android:text="16:08"/>
+                        android:textSize="@dimen/font_size_14" />
 
                     <!--SIP状态图标-->
                     <TextView
@@ -113,8 +116,8 @@
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:visibility="gone"
-                        android:background="@mipmap/sip_b"/>
+                        android:background="@mipmap/sip_b"
+                        android:visibility="gone" />
 
                     <ImageView
                         android:id="@+id/msg_view_title_layout_iv_bt"
@@ -123,7 +126,8 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:visibility="gone"/>
+                        android:visibility="gone" />
+
                     <ImageView
                         android:id="@+id/msg_view_title_layout_iv_wifi"
                         android:layout_width="20dp"
@@ -131,7 +135,8 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:visibility="gone"/>
+                        android:visibility="gone" />
+
                     <ImageView
                         android:id="@+id/msg_view_title_layout_iv_tcp"
                         android:layout_width="20dp"
@@ -139,7 +144,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:src="@mipmap/ic_tcp_fail"/>
+                        android:src="@mipmap/ic_tcp_fail" />
 
                     <ImageView
                         android:id="@+id/msg_view_title_layout_iv_ethernet"
@@ -148,8 +153,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:src="@mipmap/ic_ethernet_success_w"
-                        />
+                        android:src="@mipmap/ic_ethernet_success_w" />
 
                     <ImageView
                         android:id="@+id/msg_view_title_layout_iv_day_night"
@@ -167,205 +171,206 @@
             <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"
-                />
+                android:layout_marginTop="@dimen/d21"
+                android:layout_marginBottom="@dimen/d80"
+                android:src="@mipmap/msg_bg" />
+
             <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"
-                >
+                android:padding="@dimen/d30">
+
                 <TextView
                     android:id="@+id/screensacver_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@drawable/shape_screen_txt_bg"
+                    android:gravity="center"
+                    android:padding="@dimen/d40"
                     android:text="@string/str_be_quiet"
-                    android:textStyle="bold"
                     android:textColor="@color/white"
-                    android:background="@drawable/shape_screen_txt_bg"
                     android:textSize="80sp"
-                    android:padding="@dimen/d40"
-                    android:gravity="center" />
+                    android:textStyle="bold" />
             </LinearLayout>
         </RelativeLayout>
+
         <include
             android:id="@+id/activity_calling_bed_layout_title"
-            layout="@layout/view_title_layout"
-            />
+            layout="@layout/view_title_layout" />
 
         <RelativeLayout
+            android:id="@+id/rl_msg_title"
             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_marginTop="@dimen/d20"
             android:layout_marginRight="@dimen/d24"
-            android:orientation="vertical"
-            >
+            android:background="@drawable/shape_bed_bg"
+            android:orientation="vertical">
+
             <TextView
                 android:id="@+id/nurse_msg_tx_1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d28"
+                android:layout_marginTop="@dimen/d24"
                 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" />
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/nurse_msg_tx_2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d24"
                 android:layout_toRightOf="@+id/nurse_msg_tx_1"
                 android:text="@string/str_input_custom_info"
-                android:textSize="@dimen/font_size_18"
                 android:textColor="@color/black"
-                android:textStyle="bold"
-                android:layout_marginTop="@dimen/d24" />
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
 
             <EditText
                 android:id="@+id/nurse_msg_ed"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/d50"
+                android:layout_below="@+id/nurse_msg_tx_1"
+                android:layout_marginLeft="@dimen/d28"
+                android:layout_marginTop="@dimen/d16"
+                android:layout_marginRight="@dimen/d48"
+                android:background="@drawable/shape_n_login_ed_bg2"
+                android:gravity="center_vertical"
                 android:hint="@string/str_be_quiet"
                 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" />
+                android:textStyle="bold" />
 
         </RelativeLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
             <RelativeLayout
+                android:id="@+id/rl_msg_content"
                 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:layout_marginTop="@dimen/d20"
+                android:background="@drawable/shape_bed_bg"
                 android:orientation="vertical">
+
                 <TextView
                     android:id="@+id/nurse_msg_tx_3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:layout_marginTop="@dimen/d24"
                     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"
-                    />
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/nurse_msg_tx_4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d24"
                     android:layout_toRightOf="@+id/nurse_msg_tx_3"
                     android:text="@string/str_hint_text"
-                    android:textSize="@dimen/font_size_18"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
-                    android:layout_marginTop="@dimen/d24"
-                    />
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
 
                 <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"
-                    >
+                    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:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d20"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_be_quiet"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
+
                     <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:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d16"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_no_noise"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
+
                     <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:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d16"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_no_entry"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
+
                     <TextView
                         android:id="@+id/nurse_msg_tx_8"
                         android:layout_width="@dimen/d270"
                         android:layout_height="@dimen/d48"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:layout_marginTop="@dimen/d20"
                         android:layout_toRightOf="@+id/nurse_msg_tx_5"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_no_disturb"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
+
                     <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_marginLeft="@dimen/d10"
+                        android:layout_marginTop="@dimen/d16"
                         android:layout_toRightOf="@+id/nurse_msg_tx_6"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_no_visitation"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
+
                     <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_marginLeft="@dimen/d10"
+                        android:layout_marginTop="@dimen/d16"
                         android:layout_toRightOf="@+id/nurse_msg_tx_7"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_no_gather"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
 
                 </RelativeLayout>
 
@@ -375,128 +380,127 @@
                     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_marginRight="@dimen/d28"
                     android:layout_marginBottom="@dimen/d15"
                     android:visibility="gone"
 
                     />
 
             </RelativeLayout>
+
             <RelativeLayout
+                android:id="@+id/rl_msg_time"
                 android:layout_width="@dimen/d365"
                 android:layout_height="@dimen/d265"
-                android:background="@drawable/shape_bed_bg"
+                android:layout_marginLeft="@dimen/d15"
                 android:layout_marginTop="@dimen/d20"
                 android:layout_marginRight="@dimen/d28"
-                android:layout_marginLeft="@dimen/d15"
-                android:orientation="vertical"
-                >
+                android:background="@drawable/shape_bed_bg"
+                android:orientation="vertical">
+
                 <TextView
                     android:id="@+id/nurse_msg_tx_11"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:layout_marginTop="@dimen/d24"
                     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"
-                    />
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/nurse_msg_tx_12"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d24"
                     android:layout_toRightOf="@+id/nurse_msg_tx_11"
                     android:text="@string/str_hint_time"
-                    android:textSize="@dimen/font_size_18"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
-                    android:layout_marginTop="@dimen/d24"
-                    />
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
 
                 <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:layout_marginLeft="@dimen/d28"
+                    android:layout_marginTop="@dimen/d20"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_10min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
+
                 <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:layout_marginLeft="@dimen/d28"
+                    android:layout_marginTop="@dimen/d16"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_30min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
+
                 <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:layout_marginLeft="@dimen/d28"
+                    android:layout_marginTop="@dimen/d16"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_90min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
+
                 <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_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d20"
                     android:layout_toRightOf="@+id/nurse_msg_tx_13"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_15min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
+
                 <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_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d16"
                     android:layout_toRightOf="@+id/nurse_msg_tx_14"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_60min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
+
                 <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_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d16"
                     android:layout_toRightOf="@+id/nurse_msg_tx_15"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_120min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
             </RelativeLayout>
 
         </LinearLayout>
@@ -506,11 +510,11 @@
             android:layout_width="@dimen/d420"
             android:layout_height="@dimen/d60"
             android:layout_gravity="center"
+            android:layout_marginTop="@dimen/d26"
+            android:background="@drawable/shape_main_hos_txt_bg"
             android:gravity="center"
             android:text="@string/str_confirm"
             android:textColor="@color/white"
-            android:background="@drawable/shape_main_hos_txt_bg"
-            android:layout_marginTop="@dimen/d26"
             android:textSize="@dimen/font_size_20" />
     </LinearLayout>
 

android_bed/src/main/res/layout-land/callingbed_video_activity.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        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">
+
+            <RelativeLayout
+                android:id="@+id/frame_video_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <VideoView
+                    android:id="@+id/video_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentRight="true"/>
+            </RelativeLayout>
+
+            <ImageView
+                android:id="@+id/iv_play_video"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_centerInParent="true"
+                android:src="@drawable/ic_pause_video"
+                android:visibility="gone"/>
+
+            <LinearLayout
+                android:id="@+id/ll_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_video_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/video_volume_bar"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:padding="8dp"
+                        android:max="10"
+                        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>
+
+            <LinearLayout
+                android:id="@+id/ll_video_progress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="40dp">
+
+                <TextView
+                    android:id="@+id/start_time"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="--:--"
+                    android:textColor="#edb1f1"
+                    android:layout_weight="2"/>
+
+                <SeekBar
+                    android:id="@+id/video_progress"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="8"
+                    android:background="@drawable/bg_seekbar_round"
+                    android:progressTint="#7FFFD4"
+                    android:thumbTint="#7FFFD4"/>
+
+                <TextView
+                    android:id="@+id/end_time"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="--:--"
+                    android:textColor="#edb1f1"
+                    android:layout_weight="2"/>
+            </LinearLayout>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+</layout>

android_bed/src/main/res/layout-land/exo_player_activity.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/activity_calling_bed_layout_title"
+            layout="@layout/view_title_layout" />
+
+        <FrameLayout
+            android:id="@+id/player_root_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:keepScreenOn="true">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <com.google.android.exoplayer2.ui.PlayerView
+                    android:id="@+id/player_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:show_subtitle_button="true"
+                    app:hide_on_touch="true"
+                    app:use_controller="true"
+                    app:show_vr_button="false"
+                    app:show_shuffle_button="false"
+                    app:show_next_button="false"
+                    app:show_previous_button="false"
+                    app:resize_mode="fill"/>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_volume_bar"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="right"
+                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_video_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/video_volume_bar"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:padding="8dp"
+                        android:max="10"
+                        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>
+
+        </FrameLayout>
+    </LinearLayout>
+
+</layout>

android_bed/src/main/res/layout-land/iptv_list_play_activity.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        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">
+
+            <RelativeLayout
+                android:id="@+id/frame_video_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <VideoView
+                    android:id="@+id/video_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentRight="true"/>
+            </RelativeLayout>
+
+            <ImageView
+                android:id="@+id/iv_play_video"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_centerInParent="true"
+                android:src="@drawable/ic_pause_video"
+                android:visibility="gone"/>
+
+            <LinearLayout
+                android:id="@+id/ll_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_video_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/video_volume_bar"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:padding="8dp"
+                        android:max="10"
+                        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>
+
+            <LinearLayout
+                android:id="@+id/ll_video_progress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="40dp">
+
+                <TextView
+                    android:id="@+id/start_time"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="--:--"
+                    android:textColor="#edb1f1"
+                    android:layout_weight="2"/>
+
+                <SeekBar
+                    android:id="@+id/video_progress"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="8"
+                    android:background="@drawable/bg_seekbar_round"
+                    android:progressTint="#7FFFD4"
+                    android:thumbTint="#7FFFD4"/>
+
+                <TextView
+                    android:id="@+id/end_time"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="--:--"
+                    android:textColor="#edb1f1"
+                    android:layout_weight="2"/>
+            </LinearLayout>
+
+            <FrameLayout
+                android:id="@+id/frame_channel_list"
+                android:layout_width="300dp"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="80dp"
+                android:visibility="gone">
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/iptv_channel_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/color_transparent"
+                    android:padding="6dp"/>
+
+                <TextView
+                    android:id="@+id/tv_no_channel"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/str_iptv_no_channel"
+                    android:textSize="40sp"
+                    android:textColor="@color/colorAccent"
+                    android:visibility="gone"/>
+            </FrameLayout>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+</layout>

android_bed/src/main/res/layout-land/iptv_player_activity.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/activity_calling_bed_layout_title"
+            layout="@layout/view_title_layout" />
+
+        <FrameLayout
+            android:id="@+id/iptv_root_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:keepScreenOn="true">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <com.google.android.exoplayer2.ui.PlayerView
+                    android:id="@+id/exo_player_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:show_subtitle_button="true"
+                    app:hide_on_touch="true"
+                    app:use_controller="true"
+                    app:show_vr_button="false"
+                    app:show_shuffle_button="false"
+                    app:show_fastforward_button="false"
+                    app:show_rewind_button="false"
+                    app:resize_mode="fill"/>
+            </RelativeLayout>
+
+            <FrameLayout
+                android:id="@+id/frame_channels"
+                android:layout_width="300dp"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="88dp"
+                android:visibility="gone">
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/iptv_channel_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/color_transparent"
+                    android:padding="6dp"/>
+
+                <TextView
+                    android:id="@+id/tv_no_channel"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/str_iptv_no_channel"
+                    android:textSize="40sp"
+                    android:textColor="@color/colorAccent"
+                    android:visibility="gone"/>
+            </FrameLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_volume_bar"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="right"
+                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_video_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/video_volume_bar"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:padding="8dp"
+                        android:max="10"
+                        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>
+
+        </FrameLayout>
+    </LinearLayout>
+
+</layout>

android_bed/src/main/res/layout-land/item_icon_lay.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/d20"
+        android:layout_marginTop="@dimen/d20"
+        android:background="@drawable/shape_bed_bg">
+
+        <LinearLayout
+            android:id="@+id/ll_menu_bt"
+            android:layout_width="320dp"
+            android:layout_height="120dp"
+            android:clickable="true"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_below="@+id/tv_nursing_code">
+
+            <ImageView
+                android:id="@+id/img_menu"
+                android:layout_width="@dimen/d80"
+                android:layout_height="@dimen/d80"
+                android:layout_marginLeft="@dimen/d34"
+                android:src="@drawable/ic_device"/>
+
+            <TextView
+                android:id="@+id/tx_menu"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:layout_marginLeft="@dimen/d21"
+                android:text="--"
+                android:textSize="18sp" />
+
+            <ImageView
+                android:id="@+id/img_menu1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d24"
+                android:background="@mipmap/jr" />
+        </LinearLayout>
+
+    </LinearLayout>
+</layout>

android_bed/src/main/res/layout-land/item_nurse_config.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_nurse_item"
+    android:layout_width="184dp"
+    android:layout_height="@dimen/d100"
+    android:layout_marginBottom="@dimen/d24"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:background="@drawable/shape_bed_bg">
+
+    <ImageView
+        android:id="@+id/img_nurse_item"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
+        android:layout_marginLeft="6dp"
+        android:scaleType="center"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/bed_f_txt"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/str_empty"
+        android:gravity="center_vertical"
+        android:paddingLeft="@dimen/d10"
+        android:paddingRight="@dimen/d10"
+        android:textColor="@color/white"
+        android:textSize="@dimen/font_size_24"/>
+
+</LinearLayout>

android_bed/src/main/res/layout-land/main_calling.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+<layout>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -10,16 +10,16 @@
         android:id="@+id/title_layout_tv_hospital_hl_name"
         android:layout_width="match_parent"
         android:layout_height="@dimen/d50"
-        android:text="@string/call_list"
+        android:text="@string/str_call"
         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" />
+        android:id="@+id/main_calling_rv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
 </LinearLayout>
 

android_bed/src/main/res/layout-land/main_view_layout.xml

@@ -0,0 +1,509 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingRight="@dimen/d56">
+
+        <RelativeLayout
+            android:id="@+id/main_view_bg"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@mipmap/bingren_bg">
+
+            <LinearLayout
+                android:id="@+id/ll_bed"
+                android:layout_width="@dimen/d260"
+                android:layout_height="@dimen/d250"
+                android:layout_marginLeft="@dimen/d10"
+                android:layout_marginTop="@dimen/d24"
+                android:background="@mipmap/chuanghao_bg2"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:paddingLeft="14dp"
+                android:paddingRight="14dp">
+
+                <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+                    android:id="@+id/tv_bed_name_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:marqueeRepeatLimit="-1"
+                    android:singleLine="true"
+                    android:text="--"
+                    android:textColor="@color/txt_number2"
+                    android:textSize="100sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tv_bed_card_no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/txt_number2"
+                    android:textSize="18sp"
+                    android:visibility="gone" />
+            </LinearLayout>
+
+            <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+                android:id="@+id/tv_bed_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d20"
+                android:layout_marginTop="@dimen/d24"
+                android:layout_toLeftOf="@id/ll_qr_code"
+                android:layout_toRightOf="@+id/ll_bed"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="-1"
+                android:singleLine="true"
+                android:text="--"
+                android:textColor="@color/white"
+                android:textSize="100sp" />
+
+            <TextView
+                android:id="@+id/tv_bed_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv_bed_name"
+                android:layout_alignLeft="@+id/tv_bed_name"
+                android:layout_marginTop="15dp"
+                android:drawableLeft="@mipmap/zhuyuan"
+                android:drawablePadding="@dimen/d10"
+                android:gravity="center"
+                android:text="@string/card_no"
+                android:textColor="@color/white"
+                android:textSize="@dimen/font_size_20" />
+
+            <TextView
+                android:id="@+id/tv_bed_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv_bed_code"
+                android:layout_alignLeft="@+id/tv_bed_name"
+                android:layout_marginTop="@dimen/d18"
+                android:drawableLeft="@mipmap/ruyuan"
+                android:drawablePadding="@dimen/d10"
+                android:gravity="center"
+                android:text="@string/indate"
+                android:textColor="@color/white"
+                android:textSize="@dimen/font_size_20" />
+
+            <TextView
+                android:id="@+id/tv_bed_age"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv_bed_name"
+                android:layout_alignTop="@+id/tv_bed_code"
+                android:layout_marginLeft="@dimen/d30"
+                android:layout_toRightOf="@+id/tv_bed_code"
+                android:padding="@dimen/d3"
+                android:text="@string/str_age"
+                android:textColor="@color/white"
+                android:textSize="@dimen/font_size_20" />
+
+            <TextView
+                android:id="@+id/tv_bed_sex"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv_bed_age"
+                android:layout_alignTop="@+id/tv_bed_time"
+                android:layout_marginLeft="@dimen/d20"
+                android:layout_toRightOf="@+id/tv_bed_time"
+                android:padding="@dimen/d3"
+                android:text="@string/str_gender_none"
+                android:textColor="@color/white"
+                android:textSize="@dimen/font_size_20" />
+
+            <LinearLayout
+                android:id="@+id/ll_qr_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="@dimen/d24"
+                android:layout_marginRight="@dimen/d6"
+                android:gravity="center"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/image_qr_code"
+                    android:layout_width="140dp"
+                    android:layout_height="140dp" />
+
+                <TextView
+                    android:layout_width="20dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="6dp"
+                    android:gravity="center"
+                    android:text="@string/str_service"
+                    android:textSize="20sp" />
+            </LinearLayout>
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                    android:id="@+id/rv_main_view_ll"
+                    android:layout_width="570dp"
+                    android:layout_height="match_parent"
+                    android:visibility="gone"
+                    app:srlEnableRefresh="false">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_main_view"
+                        android:layout_width="567dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="@dimen/d20" />
+                </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+                <RelativeLayout
+                    android:id="@+id/rv_main_view_s"
+                    android:layout_width="567dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d48">
+
+                    <TextView
+                        android:id="@+id/bed_f_txt1"
+                        android:layout_width="@dimen/d177"
+                        android:layout_height="@dimen/d89"
+                        android:background="@drawable/shape_bed_bg"
+                        android:drawableLeft="@mipmap/dengji"
+                        android:drawablePadding="@dimen/d14"
+                        android:gravity="center_vertical"
+                        android:paddingLeft="@dimen/d19"
+                        android:paddingRight="@dimen/d29"
+                        android:text="@string/str_empty"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/bed_f_txt2"
+                        android:layout_width="@dimen/d177"
+                        android:layout_height="@dimen/d89"
+                        android:layout_marginLeft="@dimen/d18"
+                        android:layout_toRightOf="@+id/bed_f_txt1"
+                        android:background="@drawable/shape_bed_bg"
+                        android:drawableLeft="@mipmap/celiang"
+                        android:drawablePadding="@dimen/d14"
+                        android:gravity="center_vertical"
+                        android:paddingLeft="@dimen/d19"
+                        android:paddingRight="@dimen/d29"
+                        android:text="@string/str_empty"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/bed_f_txt3"
+                        android:layout_width="@dimen/d177"
+                        android:layout_height="@dimen/d89"
+                        android:layout_marginLeft="@dimen/d18"
+                        android:layout_toRightOf="@+id/bed_f_txt2"
+                        android:background="@drawable/shape_bed_bg"
+                        android:drawableLeft="@mipmap/geli"
+                        android:drawablePadding="@dimen/d14"
+                        android:gravity="center_vertical"
+                        android:paddingLeft="@dimen/d19"
+                        android:paddingRight="@dimen/d29"
+                        android:text="@string/str_empty"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/bed_f_txt4"
+                        android:layout_width="@dimen/d177"
+                        android:layout_height="@dimen/d89"
+                        android:layout_below="@+id/bed_f_txt1"
+                        android:layout_marginTop="@dimen/d20"
+                        android:background="@drawable/shape_bed_bg"
+                        android:drawableLeft="@mipmap/yinshi"
+                        android:drawablePadding="@dimen/d14"
+                        android:gravity="center_vertical"
+                        android:paddingLeft="@dimen/d19"
+                        android:paddingRight="@dimen/d29"
+                        android:text="@string/str_empty"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/bed_f_txt5"
+                        android:layout_width="@dimen/d177"
+                        android:layout_height="@dimen/d89"
+                        android:layout_below="@+id/bed_f_txt1"
+                        android:layout_marginLeft="@dimen/d18"
+                        android:layout_marginTop="@dimen/d20"
+                        android:layout_toRightOf="@+id/bed_f_txt4"
+                        android:background="@drawable/shape_bed_bg"
+                        android:drawableLeft="@mipmap/guom"
+                        android:drawablePadding="@dimen/d14"
+                        android:gravity="center_vertical"
+                        android:paddingLeft="@dimen/d19"
+                        android:paddingRight="@dimen/d29"
+                        android:text="@string/str_empty"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_14" />
+
+                    <TextView
+                        android:id="@+id/bed_f_txt6"
+                        android:layout_width="@dimen/d177"
+                        android:layout_height="@dimen/d89"
+                        android:layout_below="@+id/bed_f_txt1"
+                        android:layout_marginLeft="@dimen/d18"
+                        android:layout_marginTop="@dimen/d20"
+                        android:layout_toRightOf="@+id/bed_f_txt5"
+                        android:background="@drawable/shape_bed_bg"
+                        android:drawableLeft="@mipmap/wu"
+                        android:drawablePadding="@dimen/d14"
+                        android:gravity="center_vertical"
+                        android:paddingLeft="@dimen/d19"
+                        android:paddingRight="@dimen/d29"
+                        android:text="@string/str_empty"
+                        android:textColor="@color/txt_setting"
+                        android:textSize="@dimen/font_size_14" />
+
+                </RelativeLayout>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="@dimen/d240"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/d18"
+                android:layout_marginTop="@dimen/d18"
+                android:background="@drawable/shape_bed_bg"
+                android:orientation="vertical">
+
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginRight="@dimen/d5"
+                    android:layout_weight="1">
+
+                    <ImageView
+                        android:id="@+id/bed_medic_img"
+                        android:layout_width="@dimen/d43"
+                        android:layout_height="@dimen/d43"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d40"
+                        android:background="@mipmap/ys_img" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        android:layout_toRightOf="@+id/bed_medic_img"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/bed_medic_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/str_empty"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/font_size_18" />
+
+                        <TextView
+                            android:id="@+id/bed_medic_info"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@+id/bed_medic_name"
+                            android:layout_marginTop="@dimen/d8"
+                            android:layout_toRightOf="@+id/bed_medic_img"
+                            android:background="@drawable/shape_bed_medic_txt_bg"
+                            android:paddingLeft="@dimen/d13"
+                            android:paddingTop="@dimen/d3"
+                            android:paddingRight="@dimen/d13"
+                            android:paddingBottom="@dimen/d3"
+                            android:text="@string/doctor_title"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/font_size_16" />
+                    </LinearLayout>
+
+                </RelativeLayout>
+
+                <View
+                    android:id="@+id/f_tx_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/view_bg" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginRight="@dimen/d5"
+
+                    android:layout_weight="1"
+                    android:gravity="center_vertical">
+
+                    <ImageView
+                        android:id="@+id/bed_medic_img2"
+                        android:layout_width="@dimen/d43"
+                        android:layout_height="@dimen/d43"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d40"
+                        android:background="@mipmap/hs_img" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        android:layout_toRightOf="@+id/bed_medic_img2"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/bed_medic_name2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/str_empty"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/font_size_18" />
+
+                        <TextView
+                            android:id="@+id/bed_medic_info2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@+id/bed_medic_name2"
+                            android:layout_marginTop="@dimen/d8"
+                            android:layout_toRightOf="@+id/bed_medic_img2"
+                            android:background="@drawable/shape_bed_nurse_txt_bg"
+                            android:paddingLeft="@dimen/d13"
+                            android:paddingTop="@dimen/d3"
+                            android:paddingRight="@dimen/d13"
+                            android:paddingBottom="@dimen/d3"
+                            android:text="@string/nurse_title"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/font_size_16" />
+                    </LinearLayout>
+
+
+                </RelativeLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="@dimen/d240"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/d18"
+                android:layout_marginTop="@dimen/d18"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="@dimen/d128"
+                    android:layout_height="@dimen/d36"
+                    android:background="@mipmap/fengxian"
+                    android:drawableLeft="@mipmap/fengxian2"
+                    android:drawablePadding="@dimen/d7"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d18"
+                    android:text="@string/str_tips"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/font_size_14" />
+
+                <ScrollView
+                    android:id="@+id/scrollView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d50"
+                            android:layout_marginLeft="@dimen/d22"
+                            android:layout_marginTop="@dimen/d11"
+                            android:layout_marginRight="@dimen/d14"
+                            android:background="@drawable/shape_main_txt_bg"
+                            android:drawableRight="@mipmap/jiantou"
+                            android:drawablePadding="@dimen/d7"
+                            android:gravity="center"
+                            android:paddingLeft="@dimen/d18"
+                            android:textColor="@color/txt_setting"
+                            android:textSize="@dimen/font_size_14" />
+
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d50"
+                            android:layout_marginLeft="@dimen/d22"
+                            android:layout_marginTop="@dimen/d11"
+                            android:layout_marginRight="@dimen/d14"
+                            android:background="@drawable/shape_main_txt_bg"
+                            android:drawableRight="@mipmap/jiantou"
+                            android:drawablePadding="@dimen/d7"
+                            android:gravity="center"
+                            android:paddingLeft="@dimen/d18"
+                            android:textColor="@color/txt_setting"
+                            android:textSize="@dimen/font_size_14" />
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d50"
+                            android:layout_marginLeft="@dimen/d22"
+                            android:layout_marginTop="@dimen/d11"
+                            android:layout_marginRight="@dimen/d14"
+                            android:background="@drawable/shape_main_txt_bg"
+                            android:drawableRight="@mipmap/jiantou"
+                            android:drawablePadding="@dimen/d7"
+                            android:gravity="center"
+                            android:paddingLeft="@dimen/d18"
+                            android:textColor="@color/txt_setting"
+                            android:textSize="@dimen/font_size_14" />
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d50"
+                            android:layout_marginLeft="@dimen/d22"
+                            android:layout_marginTop="@dimen/d11"
+                            android:layout_marginRight="@dimen/d14"
+                            android:background="@drawable/shape_main_txt_bg"
+                            android:drawableRight="@mipmap/jiantou"
+                            android:drawablePadding="@dimen/d7"
+                            android:gravity="center"
+                            android:paddingLeft="@dimen/d18"
+                            android:textColor="@color/txt_setting"
+                            android:textSize="@dimen/font_size_14" />
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d50"
+                            android:layout_marginLeft="@dimen/d22"
+                            android:layout_marginTop="@dimen/d11"
+                            android:layout_marginRight="@dimen/d14"
+                            android:background="@drawable/shape_main_txt_bg"
+                            android:drawableRight="@mipmap/jiantou"
+                            android:drawablePadding="@dimen/d7"
+                            android:gravity="center"
+                            android:paddingLeft="@dimen/d18"
+                            android:textColor="@color/txt_setting"
+                            android:textSize="@dimen/font_size_14" />
+                    </LinearLayout>
+                </ScrollView>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</layout>
+
+

android_bed/src/main/res/layout-land/sky_voice_call_layout.xml

@@ -24,7 +24,6 @@
                 android:layout_marginRight="10dp"
                 android:background="@drawable/selector_zengyuan_bt"
                 android:drawableTop="@mipmap/zengyuan"
-                android:layout_above="@+id/menu_call_nurse"
                 android:gravity="center"
                 android:padding="20dp"
                 android:text="@string/str_supports"
@@ -45,7 +44,6 @@
                 android:gravity="center"
                 android:paddingTop="@dimen/d20"
                 android:paddingBottom="@dimen/d20"
-                android:layout_alignParentBottom="true"
                 android:paddingLeft="@dimen/d6"
                 android:paddingRight="@dimen/d6"
                 android:singleLine="true"

android_bed/src/main/res/layout-land/view_title_layout.xml

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/view_calling_bed_layout_title"
+    android:layout_width="match_parent"
+    android:layout_height="42dp"
+    android:background="#00000000">
+
+    <!--设备号-->
+    <LinearLayout
+        android:id="@+id/view_title_layout_return"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
+        android:background="@drawable/shape_main_hos_txt_bg"
+        android:clickable="true"
+        android:focusable="true"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp">
+
+        <ImageView
+            android:id="@+id/view_title_layout_img"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="6dp"
+            android:background="@mipmap/return_w"
+            android:visibility="gone" />
+        <!--医院名称-->
+        <TextView
+            android:id="@+id/view_title_layout_tv_hospital_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="----"
+            android:textColor="@color/white"
+            android:textSize="@dimen/font_size_18" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/view_title_layout_tv_no_img"
+        android:layout_width="@dimen/d22"
+        android:layout_height="@dimen/d22"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="10dp"
+        android:layout_toLeftOf="@+id/view_title_layout_tv_no"
+        android:background="@mipmap/dun"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/view_title_layout_tv_no"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="10dp"
+        android:text="ID:"
+        android:textColor="@color/black"
+        android:textSize="@dimen/font_size_18"
+        android:visibility="gone" />
+
+    <!--状态图标-->
+    <LinearLayout
+        android:id="@+id/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:id="@+id/view_title_lay_day_img"
+            android:layout_width="@dimen/d18"
+            android:layout_height="@dimen/d18"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:background="@mipmap/riqi" />
+        <!--日期-->
+        <TextClock
+            android:id="@+id/view_title_lay_day_tx"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="@dimen/d5"
+            android:format12Hour="yyyy-MM-dd EEEE"
+            android:format24Hour="yyyy-MM-dd EEEE"
+            android:text="----"
+            android:textColor="@color/black"
+            android:textSize="@dimen/font_size_18" />
+
+        <ImageView
+            android:id="@+id/view_title_lay_time_img"
+            android:layout_width="@dimen/d18"
+            android:layout_height="@dimen/d18"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="@dimen/d20"
+            android:layout_marginRight="4dp"
+            android:background="@mipmap/shijian" />
+        <!--时间-->
+        <TextClock
+            android:id="@+id/view_title_lay_time_tx"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="@dimen/d5"
+            android:layout_marginRight="@dimen/d20"
+            android:format12Hour="HH:mm"
+            android:format24Hour="HH:mm"
+            android:text="--:--"
+            android:textColor="@color/black"
+            android:textSize="@dimen/font_size_18" />
+
+        <!--SIP状态图标-->
+        <!--<TextView
+            android:id="@+id/view_title_layout_tv_sip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:text="SIP"
+            android:textColor="#FF444444"
+            android:visibility="gone" />-->
+
+        <TextView
+            android:id="@+id/view_title_layout_tv_point"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:background="@mipmap/sip_b"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/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/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/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_nor" />
+
+        <ImageView
+            android:id="@+id/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:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/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" />
+
+    </LinearLayout>
+</RelativeLayout>

android_bed/src/main/res/layout/adapter_shijian_records_item.xml

@@ -3,19 +3,18 @@
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/sj_view"
-        android:layout_width="130dp"
-        android:layout_height="130dp"
+        android:layout_width="116dp"
+        android:layout_height="116dp"
+        android:padding="6dp"
+        android:layout_margin="6dp"
         android:background="@drawable/shape_mom_sj_rv_bg"
         android:gravity="center"
-        android:orientation="vertical"
-        android:clickable="true"
-        android:layout_marginBottom="@dimen/d20">
+        android:orientation="vertical">
 
         <ImageView
             android:id="@+id/sj_img"
-            android:layout_width="@dimen/d39"
-            android:layout_height="@dimen/d39"
-            android:layout_centerVertical="true"
+            android:layout_width="@dimen/d40"
+            android:layout_height="@dimen/d40"
             android:src="@mipmap/yaoshui" />
 
         <TextView
@@ -28,6 +27,7 @@
             android:paddingLeft="@dimen/d22"
             android:layout_marginTop="@dimen/d22"
             android:background="@drawable/shape_mom_txt_bg"
+            android:singleLine="true"
             android:text="--"
             android:textColor="@color/white"
             android:textSize="@dimen/font_size_16" />

android_bed/src/main/res/layout/callingbed_device_sys.xml

@@ -160,7 +160,7 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/device_sys_radio_sip_on"
+                        android:id="@+id/device_sys_radio_language_on"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/str_yes"
@@ -171,7 +171,7 @@
                         android:textSize="14px" />
 
                     <RadioButton
-                        android:id="@+id/device_sys_radio_sip_off"
+                        android:id="@+id/device_sys_radio_language_off"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/str_no"

android_bed/src/main/res/layout/callingbed_main_new.xml

@@ -11,9 +11,8 @@
             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" />
+            android:layout_marginTop="@dimen/d72" />
 
         <!--通话记录界面-->
         <FrameLayout
@@ -200,7 +199,7 @@
                 android:paddingLeft="@dimen/d6"
                 android:paddingRight="@dimen/d6"
                 android:singleLine="true"
-                android:text="@string/str_call_nurse"
+                android:text="@string/str_call"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
         </RelativeLayout>
@@ -210,14 +209,149 @@
             android:layout_width="match_parent"
             android:background="@color/huli_bg"
             android:visibility="gone"
-            android:layout_height="42dp">
+            android:layout_height="72dp">
+
+            <RelativeLayout
+                android:id="@+id/rl_huli_info"
+                android:layout_width="match_parent"
+                android:layout_height="32dp">
+
+                <ImageView
+                    android:id="@+id/title_layout_tv_no_hl_img"
+                    android:layout_width="@dimen/d28"
+                    android:layout_height="@dimen/d28"
+                    android:layout_marginLeft="10dp"
+                    android:layout_centerVertical="true"
+                    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_toRightOf="@+id/title_layout_tv_no_hl_img"
+                    android:layout_marginLeft="4dp"
+                    android:text="@string/nursing_title"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold"/>
+
+                <!--状态图标-->
+                <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:layout_marginLeft="@dimen/d5"
+                        android:format12Hour="yyyy-MM-dd EEEE"
+                        android:format24Hour="yyyy-MM-dd EEEE"
+                        android:text="16:08"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/font_size_16" />
+
+                    <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:layout_marginLeft="@dimen/d5"
+                        android:layout_marginRight="@dimen/d30"
+                        android:format12Hour="HH:mm"
+                        android:format24Hour="HH:mm"
+                        android:text="16:08"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/font_size_16" />
+
+                    <!--SIP状态图标-->
+                    <ImageView
+                        android:id="@+id/title_layout_tv_hl_point"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:src="@mipmap/sip_w"
+                        android:visibility="gone" />
+
+                    <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>
 
-            <!--设备号-->
             <LinearLayout
                 android:id="@+id/title_layout_hl_return"
-                android:layout_width="@dimen/d105"
-                android:layout_height="@dimen/d30"
-                android:layout_marginLeft="20dp"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="10dp"
+                android:layout_below="@+id/rl_huli_info"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="4dp"
                 android:background="@drawable/shape_bed_bg"
                 android:gravity="center"
                 android:layout_centerVertical="true"
@@ -235,134 +369,10 @@
                     android:id="@+id/title_layout_tv_hospital_hl_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:paddingRight="10dp"
                     android:text="@string/exit_nursing"
                     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="@string/nursing_title"
-                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状态图标-->
-                <ImageView
-                    android:id="@+id/title_layout_tv_hl_point"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="4dp"
-                    android:layout_marginRight="4dp"
-                    android:src="@mipmap/sip_w"
-                    android:visibility="gone" />
-
-                <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" />
-
+                    android:textSize="@dimen/font_size_16" />
             </LinearLayout>
 
         </RelativeLayout>
@@ -487,9 +497,10 @@
                         android:textColor="@color/white"
                         android:textSize="10sp" />
                 </LinearLayout>
+
             </LinearLayout>
-        </RelativeLayout>
 
+        </RelativeLayout>
 
     </RelativeLayout>
 </layout>

android_bed/src/main/res/layout/callingbed_nurse.xml

@@ -34,13 +34,13 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/d410"
+            android:layout_height="match_parent"
             android:layout_marginLeft="@dimen/d24"
             android:layout_marginTop="@dimen/d20"
             android:layout_marginRight="@dimen/d24"
             android:layout_marginBottom="@dimen/d20"
             android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/rv_nurse_main_ll"
@@ -54,7 +54,7 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_nurse_main_view"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/d250"
+                    android:layout_height="@dimen/d400"
                     android:layout_marginLeft="@dimen/d6"
                     android:layout_marginTop="@dimen/d15"
                     android:layout_marginRight="@dimen/d6"
@@ -68,7 +68,6 @@
                     android:layout_marginTop="@dimen/d20"
                     android:layout_marginRight="@dimen/d50"
                     android:background="@drawable/selector_nuserlogin_btn"
-                    android:clickable="true"
                     android:gravity="center"
                     android:text="@string/str_enter_medical_care"
                     android:textColor="@color/white"
@@ -77,9 +76,8 @@
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginRight="@dimen/d10"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
                 android:layout_weight="1"
                 android:background="@drawable/shape_bed_bg"
                 android:gravity="center_horizontal"
@@ -184,10 +182,10 @@
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/d10"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
                 android:layout_weight="1"
+                android:layout_marginTop="10dp"
                 android:background="@drawable/shape_bed_bg"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">

android_bed/src/main/res/layout/callingbed_nurse_main.xml

@@ -13,6 +13,13 @@
               android:layout_marginTop="@dimen/d20"
               android:layout_marginLeft="@dimen/d20"
               android:layout_marginRight="@dimen/d20">
+
+              <ImageView
+                  android:layout_width="@dimen/d180"
+                  android:layout_height="match_parent"
+                  android:layout_alignParentRight="true"
+                  android:src="@mipmap/yihu" />
+
               <TextView
                   android:id="@+id/nurse_main_tx_1"
                   android:layout_width="wrap_content"
@@ -59,19 +66,12 @@
                   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:orientation="vertical"
         android:gravity="center_vertical"
         android:layout_marginTop="@dimen/d20"
         android:layout_marginLeft="@dimen/d24"
@@ -79,30 +79,28 @@
         android:layout_marginBottom="@dimen/d20">
         <LinearLayout
             android:id="@+id/nurse_main_1_ll"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
             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">
+            android:background="@drawable/shape_bed_bg">
             <ImageView
                 android:id="@+id/nurse_main_1_img"
-                android:layout_width="@dimen/d95"
-                android:layout_height="@dimen/d95"
+                android:layout_width="@dimen/d80"
+                android:layout_height="@dimen/d80"
                 android:src="@mipmap/ding"
-                android:layout_marginTop="@dimen/d22" />
+                android:layout_marginTop="@dimen/d10" />
 
             <TextView
                 android:id="@+id/nurse_top_1_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/str_position"
-                android:textSize="@dimen/font_size_24"
+                android:textSize="@dimen/font_size_20"
                 android:textColor="@color/black"
                 android:textStyle="bold"
-                android:layout_marginTop="@dimen/d32" />
+                android:layout_marginTop="@dimen/d10" />
 
             <TextView
                 android:id="@+id/nurse_main_1_tx"
@@ -110,34 +108,33 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
-                android:layout_marginTop="@dimen/d10" />
+                android:layout_marginTop="@dimen/d4" />
         </LinearLayout>
         <LinearLayout
             android:id="@+id/nurse_main_2_ll"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
             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">
+            android:layout_marginTop="10dp">
             <ImageView
                 android:id="@+id/nurse_main_2_img"
-                android:layout_width="@dimen/d95"
-                android:layout_height="@dimen/d95"
+                android:layout_width="@dimen/d80"
+                android:layout_height="@dimen/d80"
                 android:src="@mipmap/xun"
-                android:layout_marginTop="@dimen/d22" />
+                android:layout_marginTop="@dimen/d10" />
 
             <TextView
                 android:id="@+id/nurse_top_2_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/str_patrol"
-                android:textSize="@dimen/font_size_24"
+                android:textSize="@dimen/font_size_20"
                 android:textColor="@color/black"
                 android:textStyle="bold"
-                android:layout_marginTop="@dimen/d32" />
+                android:layout_marginTop="@dimen/d10" />
 
             <TextView
                 android:id="@+id/nurse_main_2_tx"
@@ -145,34 +142,33 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
-                android:layout_marginTop="@dimen/d10" />
+                android:layout_marginTop="@dimen/d4" />
         </LinearLayout>
         <LinearLayout
             android:id="@+id/nurse_main_3_ll"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
             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">
+            android:layout_marginTop="@dimen/d10">
             <ImageView
                 android:id="@+id/nurse_main_3_img"
-                android:layout_width="@dimen/d95"
-                android:layout_height="@dimen/d95"
+                android:layout_width="@dimen/d80"
+                android:layout_height="@dimen/d80"
                 android:src="@mipmap/hu"
-                android:layout_marginTop="@dimen/d22" />
+                android:layout_marginTop="@dimen/d10" />
 
             <TextView
                 android:id="@+id/nurse_top_3_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/enter_nursing"
-                android:textSize="@dimen/font_size_24"
+                android:textSize="@dimen/font_size_20"
                 android:textColor="@color/black"
                 android:textStyle="bold"
-                android:layout_marginTop="@dimen/d32" />
+                android:layout_marginTop="@dimen/d10" />
 
             <TextView
                 android:id="@+id/nurse_main_3_tx"
@@ -180,34 +176,33 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
-                android:layout_marginTop="@dimen/d10" />
+                android:layout_marginTop="@dimen/d4" />
         </LinearLayout>
         <LinearLayout
             android:id="@+id/nurse_main_4_ll"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
             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">
+            android:layout_marginTop="@dimen/d10">
             <ImageView
                 android:id="@+id/nurse_main_4_img"
-                android:layout_width="@dimen/d95"
-                android:layout_height="@dimen/d95"
+                android:layout_width="@dimen/d80"
+                android:layout_height="@dimen/d80"
                 android:src="@mipmap/tishi"
-                android:layout_marginTop="@dimen/d22" />
+                android:layout_marginTop="@dimen/d10" />
 
             <TextView
                 android:id="@+id/nurse_top_4_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/set_hint"
-                android:textSize="@dimen/font_size_24"
+                android:textSize="@dimen/font_size_20"
                 android:textColor="@color/black"
                 android:textStyle="bold"
-                android:layout_marginTop="@dimen/d32" />
+                android:layout_marginTop="@dimen/d10" />
 
             <TextView
                 android:id="@+id/nurse_main_4_tx"
@@ -215,7 +210,7 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
-                android:layout_marginTop="@dimen/d10" />
+                android:layout_marginTop="@dimen/d4" />
         </LinearLayout>
     </LinearLayout>
 

android_bed/src/main/res/layout/callingbed_nurse_msg.xml

@@ -1,17 +1,19 @@
 <?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">
+        android:background="#F7F7F7"
+        android:orientation="vertical">
+
         <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">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -21,11 +23,11 @@
                     android:id="@+id/msg_view_title_layout_return"
                     android:layout_width="@dimen/d105"
                     android:layout_height="@dimen/d30"
+                    android:layout_centerVertical="true"
                     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
@@ -34,8 +36,8 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="6dp"
-                        android:visibility="gone"
-                        android:background="@mipmap/return_w" />
+                        android:background="@mipmap/return_w"
+                        android:visibility="gone" />
                     <!--医院名称-->
                     <TextView
                         android:id="@+id/msg_view_title_layout_tv_hospital_name"
@@ -45,17 +47,18 @@
                         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_centerVertical="true"
                     android:layout_marginRight="10dp"
                     android:text="ID:"
-                    android:visibility="gone"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_18" />
+                    android:textSize="@dimen/font_size_18"
+                    android:visibility="gone" />
                 <!--状态图标-->
                 <LinearLayout
                     android:id="@+id/msg_view_title_layout_ll_right"
@@ -78,12 +81,12 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="@dimen/d5"
                         android:format12Hour="yyyy-MM-dd EEEE"
                         android:format24Hour="yyyy-MM-dd EEEE"
+                        android:text="16:08"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/font_size_14"
-                        android:layout_marginLeft="@dimen/d5"
-                        android:text="16:08"/>
+                        android:textSize="@dimen/font_size_14" />
 
                     <ImageView
                         android:layout_width="@dimen/d22"
@@ -97,13 +100,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="@dimen/d5"
+                        android:layout_marginRight="@dimen/d15"
                         android:format12Hour="HH:mm"
                         android:format24Hour="HH:mm"
+                        android:text="16:08"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/font_size_14"
-                        android:layout_marginLeft="@dimen/d5"
-                        android:layout_marginRight="@dimen/d15"
-                        android:text="16:08"/>
+                        android:textSize="@dimen/font_size_14" />
 
                     <!--SIP状态图标-->
                     <TextView
@@ -113,8 +116,8 @@
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:visibility="gone"
-                        android:background="@mipmap/sip_b"/>
+                        android:background="@mipmap/sip_b"
+                        android:visibility="gone" />
 
                     <ImageView
                         android:id="@+id/msg_view_title_layout_iv_bt"
@@ -123,7 +126,8 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:visibility="gone"/>
+                        android:visibility="gone" />
+
                     <ImageView
                         android:id="@+id/msg_view_title_layout_iv_wifi"
                         android:layout_width="20dp"
@@ -131,7 +135,8 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:visibility="gone"/>
+                        android:visibility="gone" />
+
                     <ImageView
                         android:id="@+id/msg_view_title_layout_iv_tcp"
                         android:layout_width="20dp"
@@ -139,7 +144,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:src="@mipmap/ic_tcp_fail"/>
+                        android:src="@mipmap/ic_tcp_fail" />
 
                     <ImageView
                         android:id="@+id/msg_view_title_layout_iv_ethernet"
@@ -148,8 +153,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:src="@mipmap/ic_ethernet_success_w"
-                        />
+                        android:src="@mipmap/ic_ethernet_success_w" />
 
                     <ImageView
                         android:id="@+id/msg_view_title_layout_iv_day_night"
@@ -167,82 +171,82 @@
             <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"
-                />
+                android:layout_marginTop="@dimen/d21"
+                android:layout_marginBottom="@dimen/d80"
+                android:src="@mipmap/msg_bg" />
+
             <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">
+                android:background="@drawable/shape_screen_bg"
+                android:padding="@dimen/d30">
+
                 <TextView
                     android:id="@+id/screensacver_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@drawable/shape_screen_txt_bg"
+                    android:gravity="center"
+                    android:padding="@dimen/d40"
                     android:text="@string/str_be_quiet"
-                    android:textStyle="bold"
                     android:textColor="@color/white"
-                    android:background="@drawable/shape_screen_txt_bg"
                     android:textSize="80sp"
-                    android:padding="@dimen/d40"
-                    android:gravity="center" />
+                    android:textStyle="bold" />
             </LinearLayout>
         </RelativeLayout>
+
         <include
             android:id="@+id/activity_calling_bed_layout_title"
             layout="@layout/view_title_layout" />
 
         <RelativeLayout
+            android:id="@+id/rl_msg_title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/d144"
-            android:background="@drawable/shape_bed_bg"
+            android:layout_marginLeft="@dimen/d20"
             android:layout_marginTop="@dimen/d20"
-            android:layout_marginLeft="@dimen/d15"
-            android:layout_marginRight="@dimen/d24"
-            android:orientation="vertical"
-            >
+            android:layout_marginRight="@dimen/d20"
+            android:background="@drawable/shape_bed_bg"
+            android:orientation="vertical">
+
             <TextView
                 android:id="@+id/nurse_msg_tx_1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d28"
+                android:layout_marginTop="@dimen/d24"
                 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"
-                />
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/nurse_msg_tx_2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d24"
                 android:layout_toRightOf="@+id/nurse_msg_tx_1"
                 android:text="@string/str_input_custom_info"
-                android:textSize="@dimen/font_size_18"
                 android:textColor="@color/black"
-                android:textStyle="bold"
-                android:layout_marginTop="@dimen/d24"
-                />
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
 
             <EditText
                 android:id="@+id/nurse_msg_ed"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/d50"
+                android:layout_below="@+id/nurse_msg_tx_1"
+                android:layout_marginLeft="@dimen/d28"
+                android:layout_marginTop="@dimen/d16"
+                android:layout_marginRight="@dimen/d28"
+                android:background="@drawable/shape_n_login_ed_bg2"
+                android:gravity="center_vertical"
                 android:hint="@string/str_be_quiet"
                 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"
-                />
+                android:textStyle="bold" />
 
 
         </RelativeLayout>
@@ -250,124 +254,128 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
+            android:layout_marginLeft="@dimen/d20"
+            android:layout_marginRight="@dimen/d20"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
             <RelativeLayout
-                android:layout_width="@dimen/d600"
+                android:id="@+id/rl_msg_content"
+                android:layout_width="match_parent"
                 android:layout_height="@dimen/d265"
-                android:background="@drawable/shape_bed_bg"
                 android:layout_marginTop="@dimen/d20"
-                android:layout_marginLeft="@dimen/d24"
+                android:background="@drawable/shape_bed_bg"
                 android:orientation="vertical">
+
                 <TextView
                     android:id="@+id/nurse_msg_tx_3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:layout_marginTop="@dimen/d24"
                     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"
-                    />
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/nurse_msg_tx_4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d24"
                     android:layout_toRightOf="@+id/nurse_msg_tx_3"
                     android:text="@string/str_hint_text"
-                    android:textSize="@dimen/font_size_18"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
-                    android:layout_marginTop="@dimen/d24"
-                    />
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
 
                 <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"
-                    >
+                    android:layout_below="@+id/nurse_msg_tx_3">
+
                     <TextView
                         android:id="@+id/nurse_msg_tx_5"
-                        android:layout_width="@dimen/d270"
+                        android:layout_width="@dimen/d240"
                         android:layout_height="@dimen/d48"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d20"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_be_quiet"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
+
                     <TextView
                         android:id="@+id/nurse_msg_tx_6"
-                        android:layout_width="@dimen/d270"
+                        android:layout_width="@dimen/d240"
                         android:layout_height="@dimen/d48"
                         android:layout_below="@+id/nurse_msg_tx_5"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d16"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_no_noise"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
+
                     <TextView
                         android:id="@+id/nurse_msg_tx_7"
-                        android:layout_width="@dimen/d270"
+                        android:layout_width="@dimen/d240"
                         android:layout_height="@dimen/d48"
                         android:layout_below="@+id/nurse_msg_tx_6"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d16"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_no_entry"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
+
                     <TextView
                         android:id="@+id/nurse_msg_tx_8"
-                        android:layout_width="@dimen/d270"
+                        android:layout_width="@dimen/d240"
                         android:layout_height="@dimen/d48"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:layout_marginRight="@dimen/d28"
+                        android:layout_marginTop="@dimen/d20"
                         android:layout_toRightOf="@+id/nurse_msg_tx_5"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_no_disturb"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
+
                     <TextView
                         android:id="@+id/nurse_msg_tx_9"
-                        android:layout_width="@dimen/d270"
+                        android:layout_width="@dimen/d240"
                         android:layout_height="@dimen/d48"
                         android:layout_below="@+id/nurse_msg_tx_5"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:layout_marginRight="@dimen/d28"
+                        android:layout_marginTop="@dimen/d16"
                         android:layout_toRightOf="@+id/nurse_msg_tx_6"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_no_visitation"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
+
                     <TextView
                         android:id="@+id/nurse_msg_tx_10"
-                        android:layout_width="@dimen/d270"
+                        android:layout_width="@dimen/d240"
                         android:layout_height="@dimen/d48"
                         android:layout_below="@+id/nurse_msg_tx_6"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:layout_marginRight="@dimen/d28"
+                        android:layout_marginTop="@dimen/d16"
                         android:layout_toRightOf="@+id/nurse_msg_tx_7"
+                        android:background="@drawable/shape_time_f_bg"
                         android:gravity="center"
                         android:text="@string/str_no_gather"
-                        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"
-                        />
+                        android:textSize="@dimen/font_size_16" />
 
                 </RelativeLayout>
 
@@ -377,124 +385,123 @@
                     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_marginRight="@dimen/d28"
                     android:layout_marginBottom="@dimen/d15"
                     android:visibility="gone" />
 
             </RelativeLayout>
+
             <RelativeLayout
-                android:layout_width="@dimen/d365"
+                android:id="@+id/rl_msg_time"
+                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/d28"
-                android:layout_marginLeft="@dimen/d15"
+                android:background="@drawable/shape_bed_bg"
                 android:orientation="vertical">
+
                 <TextView
                     android:id="@+id/nurse_msg_tx_11"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:layout_marginTop="@dimen/d24"
                     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"
-                    />
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/nurse_msg_tx_12"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d24"
                     android:layout_toRightOf="@+id/nurse_msg_tx_11"
                     android:text="@string/str_hint_time"
-                    android:textSize="@dimen/font_size_18"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
-                    android:layout_marginTop="@dimen/d24" />
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/nurse_msg_tx_13"
-                    android:layout_width="@dimen/d150"
+                    android:layout_width="@dimen/d240"
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_11"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:layout_marginTop="@dimen/d20"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_10min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
+
                 <TextView
                     android:id="@+id/nurse_msg_tx_14"
-                    android:layout_width="@dimen/d150"
+                    android:layout_width="@dimen/d240"
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_13"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:layout_marginTop="@dimen/d16"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_30min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
+
                 <TextView
                     android:id="@+id/nurse_msg_tx_15"
-                    android:layout_width="@dimen/d150"
+                    android:layout_width="@dimen/d240"
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_14"
+                    android:layout_marginLeft="@dimen/d28"
+                    android:layout_marginTop="@dimen/d16"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_90min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
+
                 <TextView
                     android:id="@+id/nurse_msg_tx_16"
-                    android:layout_width="@dimen/d150"
+                    android:layout_width="@dimen/d240"
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_11"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d20"
                     android:layout_toRightOf="@+id/nurse_msg_tx_13"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_15min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
+
                 <TextView
                     android:id="@+id/nurse_msg_tx_17"
-                    android:layout_width="@dimen/d150"
+                    android:layout_width="@dimen/d240"
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_13"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d16"
                     android:layout_toRightOf="@+id/nurse_msg_tx_14"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_60min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
+
                 <TextView
                     android:id="@+id/nurse_msg_tx_18"
-                    android:layout_width="@dimen/d150"
+                    android:layout_width="@dimen/d240"
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_14"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d16"
                     android:layout_toRightOf="@+id/nurse_msg_tx_15"
+                    android:background="@drawable/shape_time_f_bg"
                     android:gravity="center"
                     android:text="@string/time_120min"
-                    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"
-                    />
+                    android:textSize="@dimen/font_size_16" />
             </RelativeLayout>
 
         </LinearLayout>
@@ -504,11 +511,11 @@
             android:layout_width="@dimen/d420"
             android:layout_height="@dimen/d60"
             android:layout_gravity="center"
+            android:layout_marginTop="@dimen/d26"
+            android:background="@drawable/shape_main_hos_txt_bg"
             android:gravity="center"
             android:text="@string/str_confirm"
             android:textColor="@color/white"
-            android:background="@drawable/shape_main_hos_txt_bg"
-            android:layout_marginTop="@dimen/d26"
             android:textSize="@dimen/font_size_20" />
     </LinearLayout>
 

android_bed/src/main/res/layout/callingbed_setting_main.xml

@@ -154,7 +154,7 @@
                         android:layout_marginTop="@dimen/d12"
                         android:layout_marginRight="@dimen/d6"
                         android:singleLine="true"
-                        android:text="@string/call_config"
+                        android:text="@string/device_config"
                         android:textColor="@color/white"
                         android:textSize="@dimen/font_size_14"
                         android:textStyle="bold" />

android_bed/src/main/res/layout/callingbed_video_activity.xml

@@ -22,11 +22,8 @@
                 <VideoView
                     android:id="@+id/video_view"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentRight="true"/>
+                    android:layout_height="@dimen/d600"
+                    android:layout_centerInParent="true"/>
             </RelativeLayout>
 
             <ImageView
@@ -42,7 +39,7 @@
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_alignParentRight="true"
-                android:layout_marginRight="120dp"
+                android:layout_marginRight="40dp"
                 android:layout_marginTop="100dp"
                 android:layout_marginBottom="100dp"
                 android:clipChildren="true"

android_bed/src/main/res/layout/exo_player_activity.xml

@@ -23,7 +23,8 @@
                 <com.google.android.exoplayer2.ui.PlayerView
                     android:id="@+id/player_view"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/d600"
+                    android:layout_centerInParent="true"
                     app:show_subtitle_button="true"
                     app:hide_on_touch="true"
                     app:use_controller="true"
@@ -31,7 +32,7 @@
                     app:show_shuffle_button="false"
                     app:show_next_button="false"
                     app:show_previous_button="false"
-                    app:resize_mode="fill"/>
+                    app:resize_mode="fit"/>
             </RelativeLayout>
 
             <LinearLayout
@@ -39,7 +40,7 @@
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_gravity="right"
-                android:layout_marginRight="120dp"
+                android:layout_marginRight="40dp"
                 android:layout_marginTop="100dp"
                 android:layout_marginBottom="100dp"
                 android:clipChildren="true"

android_bed/src/main/res/layout/iptv_list_play_activity.xml

@@ -22,11 +22,8 @@
                 <VideoView
                     android:id="@+id/video_view"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentRight="true"/>
+                    android:layout_height="@dimen/d600"
+                    android:layout_centerInParent="true"/>
             </RelativeLayout>
 
             <ImageView
@@ -42,7 +39,7 @@
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_alignParentRight="true"
-                android:layout_marginRight="120dp"
+                android:layout_marginRight="40dp"
                 android:layout_marginTop="100dp"
                 android:layout_marginBottom="100dp"
                 android:clipChildren="true"

android_bed/src/main/res/layout/iptv_player_activity.xml

@@ -23,7 +23,8 @@
                 <com.google.android.exoplayer2.ui.PlayerView
                     android:id="@+id/exo_player_view"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/d600"
+                    android:layout_centerInParent="true"
                     app:show_subtitle_button="true"
                     app:hide_on_touch="true"
                     app:use_controller="true"
@@ -31,7 +32,7 @@
                     app:show_shuffle_button="false"
                     app:show_fastforward_button="false"
                     app:show_rewind_button="false"
-                    app:resize_mode="fill"/>
+                    app:resize_mode="fit"/>
             </RelativeLayout>
 
             <FrameLayout
@@ -64,7 +65,7 @@
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_gravity="right"
-                android:layout_marginRight="120dp"
+                android:layout_marginRight="40dp"
                 android:layout_marginTop="100dp"
                 android:layout_marginBottom="100dp"
                 android:clipChildren="true"

android_bed/src/main/res/layout/item_icon_lay.xml

@@ -3,42 +3,41 @@
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="100dp"
         android:layout_marginRight="@dimen/d20"
         android:layout_marginTop="@dimen/d20"
         android:background="@drawable/shape_bed_bg">
 
         <LinearLayout
             android:id="@+id/ll_menu_bt"
-            android:layout_width="320dp"
-            android:layout_height="120dp"
-            android:clickable="true"
+            android:layout_width="240dp"
+            android:layout_height="match_parent"
             android:orientation="horizontal"
-            android:gravity="center_vertical"
-            android:layout_below="@+id/tv_nursing_code">
+            android:gravity="center_vertical">
 
             <ImageView
                 android:id="@+id/img_menu"
-                android:layout_width="@dimen/d80"
-                android:layout_height="@dimen/d80"
-                android:layout_marginLeft="@dimen/d34"
+                android:layout_width="@dimen/d60"
+                android:layout_height="@dimen/d60"
+                android:layout_marginLeft="@dimen/d10"
                 android:src="@drawable/ic_device"/>
 
             <TextView
                 android:id="@+id/tx_menu"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="82dp"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
                 android:textColor="@color/black"
                 android:textStyle="bold"
-                android:layout_marginLeft="@dimen/d21"
+                android:maxLines="2"
+                android:layout_marginLeft="@dimen/d16"
                 android:text="--"
-                android:textSize="18sp" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:id="@+id/img_menu1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d24"
                 android:background="@mipmap/jr" />
         </LinearLayout>
 

android_bed/src/main/res/layout/item_nurse_config.xml

@@ -2,9 +2,11 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/ll_nurse_item"
-    android:layout_width="184dp"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/d100"
     android:layout_marginBottom="@dimen/d24"
+    android:layout_marginLeft="6dp"
+    android:layout_marginRight="6dp"
     android:orientation="horizontal"
     android:gravity="center_vertical"
     android:background="@drawable/shape_bed_bg">

android_bed/src/main/res/layout/main_call_r_dialog.xml

@@ -20,9 +20,10 @@
         <LinearLayout
             android:id="@+id/ll_call_records"
             android:layout_width="wrap_content"
-            android:layout_height="520dp"
+            android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:layout_marginTop="@dimen/d60"
+            android:layout_marginTop="@dimen/d68"
+            android:layout_marginBottom="@dimen/d200"
             android:background="@drawable/shape_main_call_r_bg"
             android:orientation="horizontal">
 
@@ -49,31 +50,18 @@
                     android:textSize="20sp" />
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="142dp"
-                android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/d16"
-                android:layout_marginBottom="@dimen/d50"
-                android:gravity="center_horizontal"
-                android:orientation="vertical">
-
-                <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"
+            <RelativeLayout
+                android:layout_width="400dp"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/d20"
+                android:layout_marginLeft="@dimen/d10"
                 android:layout_marginTop="@dimen/d16"
-                android:layout_marginRight="@dimen/d16"
-                android:layout_marginBottom="@dimen/d50"
+                android:layout_marginRight="@dimen/d10"
+                android:layout_marginBottom="@dimen/d40"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
                 <LinearLayout
+                    android:id="@+id/ll_records_title"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d54"
                     android:background="@drawable/shape_bed_bg"
@@ -141,6 +129,9 @@
                     android:id="@+id/refresh"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:layout_above="@+id/ll_event_list"
+                    android:layout_below="@+id/ll_records_title"
+                    android:layout_marginBottom="20dp"
                     bind:srlEnableLoadMore="true"
                     bind:srlEnableRefresh="true">
 
@@ -149,7 +140,25 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent" />
                 </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-            </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_event_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="140dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="@dimen/d16"
+                    android:layout_marginBottom="@dimen/d20"
+                    android:gravity="center_horizontal"
+                    android:background="@color/white"
+                    android:orientation="vertical">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/main_call_r_l_rv_1"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:padding="8dp" />
+                </LinearLayout>
+            </RelativeLayout>
         </LinearLayout>
     </RelativeLayout>
 

android_bed/src/main/res/layout/main_calling.xml

@@ -11,7 +11,7 @@
         android:id="@+id/title_layout_tv_hospital_hl_name"
         android:layout_width="match_parent"
         android:layout_height="@dimen/d50"
-        android:text="@string/call_list"
+        android:text="@string/str_call"
         android:gravity="center"
         android:textColor="@color/huli_bg"
         android:textStyle="bold"

android_bed/src/main/res/layout/main_view_layout.xml

@@ -13,14 +13,14 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
+            android:padding="10dp"
             android:background="@mipmap/bingren_bg">
 
             <LinearLayout
                 android:id="@+id/ll_bed"
-                android:layout_width="@dimen/d260"
-                android:layout_height="@dimen/d250"
-                android:layout_marginLeft="@dimen/d10"
-                android:layout_marginTop="@dimen/d24"
+                android:layout_width="@dimen/d200"
+                android:layout_height="@dimen/d180"
+                android:layout_marginTop="@dimen/d10"
                 android:background="@mipmap/chuanghao_bg2"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -54,10 +54,8 @@
                 android:id="@+id/tv_bed_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d20"
-                android:layout_marginTop="@dimen/d24"
-                android:layout_toLeftOf="@id/ll_qr_code"
-                android:layout_toRightOf="@+id/ll_bed"
+                android:layout_marginTop="@dimen/d10"
+                android:layout_below="@+id/ll_bed"
                 android:ellipsize="marquee"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
@@ -65,14 +63,36 @@
                 android:singleLine="true"
                 android:text="--"
                 android:textColor="@color/white"
-                android:textSize="100sp" />
+                android:textSize="92sp" />
 
             <TextView
-                android:id="@+id/tv_bed_code"
+                android:id="@+id/tv_bed_age"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/tv_bed_name"
-                android:layout_alignLeft="@+id/tv_bed_name"
+                android:padding="@dimen/d3"
+                android:text="@string/str_age"
+                android:textColor="@color/white"
+                android:textSize="@dimen/font_size_20" />
+
+            <TextView
+                android:id="@+id/tv_bed_sex"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@+id/tv_bed_age"
+                android:layout_marginLeft="@dimen/d20"
+                android:layout_toRightOf="@+id/tv_bed_age"
+                android:padding="@dimen/d3"
+                android:text="@string/str_gender_none"
+                android:textColor="@color/white"
+                android:textSize="@dimen/font_size_20" />
+
+            <TextView
+                android:id="@+id/tv_bed_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv_bed_age"
+                android:layout_alignLeft="@+id/tv_bed_age"
                 android:layout_marginTop="15dp"
                 android:drawableLeft="@mipmap/zhuyuan"
                 android:drawablePadding="@dimen/d10"
@@ -95,54 +115,28 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_20" />
 
-            <TextView
-                android:id="@+id/tv_bed_age"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/tv_bed_name"
-                android:layout_alignTop="@+id/tv_bed_code"
-                android:layout_marginLeft="@dimen/d30"
-                android:layout_toRightOf="@+id/tv_bed_code"
-                android:padding="@dimen/d3"
-                android:text="@string/str_age"
-                android:textColor="@color/white"
-                android:textSize="@dimen/font_size_20" />
-
-            <TextView
-                android:id="@+id/tv_bed_sex"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/tv_bed_age"
-                android:layout_alignTop="@+id/tv_bed_time"
-                android:layout_marginLeft="@dimen/d20"
-                android:layout_toRightOf="@+id/tv_bed_time"
-                android:padding="@dimen/d3"
-                android:text="@string/str_gender_none"
-                android:textColor="@color/white"
-                android:textSize="@dimen/font_size_20" />
-
             <LinearLayout
                 android:id="@+id/ll_qr_code"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_marginTop="@dimen/d24"
-                android:layout_marginRight="@dimen/d6"
+                android:layout_marginTop="@dimen/d20"
+                android:layout_marginRight="@dimen/d10"
                 android:gravity="center"
+                android:orientation="vertical"
                 android:visibility="gone">
 
                 <ImageView
                     android:id="@+id/image_qr_code"
-                    android:layout_width="140dp"
-                    android:layout_height="140dp" />
+                    android:layout_width="100dp"
+                    android:layout_height="100dp" />
 
                 <TextView
-                    android:layout_width="20dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dp"
                     android:gravity="center"
                     android:text="@string/str_service"
-                    android:textSize="20sp" />
+                    android:textSize="16sp" />
             </LinearLayout>
 
         </RelativeLayout>
@@ -151,31 +145,143 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:orientation="horizontal">
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:layout_marginTop="@dimen/d18"
+                android:background="@drawable/shape_bed_bg"
+                android:orientation="horizontal">
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                    <ImageView
+                        android:id="@+id/bed_medic_img"
+                        android:layout_width="@dimen/d43"
+                        android:layout_height="@dimen/d43"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        android:background="@mipmap/ys_img" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        android:layout_toRightOf="@+id/bed_medic_img"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/bed_medic_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/str_empty"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/font_size_18" />
+
+                        <TextView
+                            android:id="@+id/bed_medic_info"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d8"
+                            android:background="@drawable/shape_bed_medic_txt_bg"
+                            android:paddingLeft="@dimen/d13"
+                            android:paddingTop="@dimen/d3"
+                            android:paddingRight="@dimen/d13"
+                            android:paddingBottom="@dimen/d3"
+                            android:text="@string/doctor_title"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/font_size_16" />
+                    </LinearLayout>
+
+                </RelativeLayout>
+
+                <View
+                    android:id="@+id/f_tx_view"
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/view_bg" />
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="@dimen/d5"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical">
+
+                    <ImageView
+                        android:id="@+id/bed_medic_img2"
+                        android:layout_width="@dimen/d43"
+                        android:layout_height="@dimen/d43"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        android:background="@mipmap/hs_img" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d20"
+                        android:layout_toRightOf="@+id/bed_medic_img2"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/bed_medic_name2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/str_empty"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/font_size_18" />
+
+                        <TextView
+                            android:id="@+id/bed_medic_info2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d8"
+                            android:layout_toRightOf="@+id/bed_medic_img2"
+                            android:background="@drawable/shape_bed_nurse_txt_bg"
+                            android:paddingLeft="@dimen/d13"
+                            android:paddingTop="@dimen/d3"
+                            android:paddingRight="@dimen/d13"
+                            android:paddingBottom="@dimen/d3"
+                            android:text="@string/nurse_title"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/font_size_16" />
+                    </LinearLayout>
+
+
+                </RelativeLayout>
+            </LinearLayout>
 
             <RelativeLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <com.scwang.smartrefresh.layout.SmartRefreshLayout
                     android:id="@+id/rv_main_view_ll"
-                    android:layout_width="570dp"
+                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:visibility="gone"
                     app:srlEnableRefresh="false">
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_main_view"
-                        android:layout_width="567dp"
+                        android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_marginTop="@dimen/d20" />
                 </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
                 <RelativeLayout
                     android:id="@+id/rv_main_view_s"
-                    android:layout_width="567dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d48">
+                    android:layout_marginTop="@dimen/d18">
 
                     <TextView
                         android:id="@+id/bed_f_txt1"
@@ -211,8 +317,8 @@
                         android:id="@+id/bed_f_txt3"
                         android:layout_width="@dimen/d177"
                         android:layout_height="@dimen/d89"
-                        android:layout_marginLeft="@dimen/d18"
-                        android:layout_toRightOf="@+id/bed_f_txt2"
+                        android:layout_below="@+id/bed_f_txt1"
+                        android:layout_marginTop="@dimen/d20"
                         android:background="@drawable/shape_bed_bg"
                         android:drawableLeft="@mipmap/geli"
                         android:drawablePadding="@dimen/d14"
@@ -228,6 +334,8 @@
                         android:layout_width="@dimen/d177"
                         android:layout_height="@dimen/d89"
                         android:layout_below="@+id/bed_f_txt1"
+                        android:layout_toRightOf="@+id/bed_f_txt3"
+                        android:layout_marginLeft="@dimen/d18"
                         android:layout_marginTop="@dimen/d20"
                         android:background="@drawable/shape_bed_bg"
                         android:drawableLeft="@mipmap/yinshi"
@@ -243,10 +351,8 @@
                         android:id="@+id/bed_f_txt5"
                         android:layout_width="@dimen/d177"
                         android:layout_height="@dimen/d89"
-                        android:layout_below="@+id/bed_f_txt1"
-                        android:layout_marginLeft="@dimen/d18"
+                        android:layout_below="@+id/bed_f_txt3"
                         android:layout_marginTop="@dimen/d20"
-                        android:layout_toRightOf="@+id/bed_f_txt4"
                         android:background="@drawable/shape_bed_bg"
                         android:drawableLeft="@mipmap/guom"
                         android:drawablePadding="@dimen/d14"
@@ -261,7 +367,7 @@
                         android:id="@+id/bed_f_txt6"
                         android:layout_width="@dimen/d177"
                         android:layout_height="@dimen/d89"
-                        android:layout_below="@+id/bed_f_txt1"
+                        android:layout_below="@+id/bed_f_txt3"
                         android:layout_marginLeft="@dimen/d18"
                         android:layout_marginTop="@dimen/d20"
                         android:layout_toRightOf="@+id/bed_f_txt5"
@@ -284,125 +390,6 @@
                 android:layout_marginLeft="@dimen/d18"
                 android:layout_marginTop="@dimen/d18"
                 android:background="@drawable/shape_bed_bg"
-                android:orientation="vertical">
-
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_marginRight="@dimen/d5"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bed_medic_img"
-                        android:layout_width="@dimen/d43"
-                        android:layout_height="@dimen/d43"
-                        android:layout_centerVertical="true"
-                        android:layout_marginLeft="@dimen/d40"
-                        android:background="@mipmap/ys_img" />
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_marginLeft="@dimen/d20"
-                        android:layout_toRightOf="@+id/bed_medic_img"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/bed_medic_name"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/str_empty"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/font_size_18" />
-
-                        <TextView
-                            android:id="@+id/bed_medic_info"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/bed_medic_name"
-                            android:layout_marginTop="@dimen/d8"
-                            android:layout_toRightOf="@+id/bed_medic_img"
-                            android:background="@drawable/shape_bed_medic_txt_bg"
-                            android:paddingLeft="@dimen/d13"
-                            android:paddingTop="@dimen/d3"
-                            android:paddingRight="@dimen/d13"
-                            android:paddingBottom="@dimen/d3"
-                            android:text="@string/doctor_title"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/font_size_16" />
-                    </LinearLayout>
-
-                </RelativeLayout>
-
-                <View
-                    android:id="@+id/f_tx_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/view_bg" />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_marginRight="@dimen/d5"
-
-                    android:layout_weight="1"
-                    android:gravity="center_vertical">
-
-                    <ImageView
-                        android:id="@+id/bed_medic_img2"
-                        android:layout_width="@dimen/d43"
-                        android:layout_height="@dimen/d43"
-                        android:layout_centerVertical="true"
-                        android:layout_marginLeft="@dimen/d40"
-                        android:background="@mipmap/hs_img" />
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_marginLeft="@dimen/d20"
-                        android:layout_toRightOf="@+id/bed_medic_img2"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/bed_medic_name2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/str_empty"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/font_size_18" />
-
-                        <TextView
-                            android:id="@+id/bed_medic_info2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/bed_medic_name2"
-                            android:layout_marginTop="@dimen/d8"
-                            android:layout_toRightOf="@+id/bed_medic_img2"
-                            android:background="@drawable/shape_bed_nurse_txt_bg"
-                            android:paddingLeft="@dimen/d13"
-                            android:paddingTop="@dimen/d3"
-                            android:paddingRight="@dimen/d13"
-                            android:paddingBottom="@dimen/d3"
-                            android:text="@string/nurse_title"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/font_size_16" />
-                    </LinearLayout>
-
-
-                </RelativeLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="@dimen/d240"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/d18"
-                android:layout_marginTop="@dimen/d18"
-                android:background="@drawable/shape_bed_bg"
                 android:gravity="center"
                 android:orientation="vertical"
                 android:visibility="gone">

android_bed/src/main/res/layout/sky_voice_call_layout.xml

@@ -150,23 +150,23 @@
 
                     <ImageView
                         android:id="@+id/sky_voice_call_mute"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp"
-                        android:layout_marginRight="40dp"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_marginRight="20dp"
                         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:layout_width="80dp"
+                        android:layout_height="80dp"
                         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:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_marginLeft="20dp"
                         android:src="@drawable/av_speaker_selector"
                         android:visibility="gone" />
 
@@ -186,27 +186,27 @@
                 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:layout_width="80dp"
+                    android:layout_height="80dp"
                     android:src="@drawable/selector_call_hangup" />
 
-                <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="1" />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="2" />
+                <ImageView
+                    android:id="@+id/sky_voice_call_ring_pickup_audio"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:src="@drawable/selector_call_answer" />
 
                 <View
                     android:layout_width="0dp"
@@ -221,7 +221,7 @@
                 android:layout_height="match_parent"
                 android:layout_alignParentRight="true"
                 android:layout_marginTop="100dp"
-                android:layout_marginRight="120dp"
+                android:layout_marginRight="40dp"
                 android:layout_marginBottom="100dp"
                 android:clipChildren="true"
                 android:gravity="center"

android_bed/src/main/res/layout/view_title_layout.xml

@@ -2,17 +2,135 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/view_calling_bed_layout_title"
     android:layout_width="match_parent"
-    android:layout_height="42dp"
+    android:layout_height="68dp"
     android:background="#00000000">
 
-    <!--设备号-->
+    <!--状态图标-->
+    <RelativeLayout
+        android:id="@+id/view_title_layout_ll_right"
+        android:layout_width="match_parent"
+        android:layout_height="24dp"
+        android:layout_marginTop="4dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp">
+
+        <ImageView
+            android:id="@+id/view_title_lay_day_img"
+            android:layout_width="@dimen/d20"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:scaleType="centerInside"
+            android:src="@mipmap/riqi" />
+
+        <!--日期-->
+        <TextClock
+            android:id="@+id/view_title_lay_day_tx"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/view_title_lay_day_img"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_centerVertical="true"
+            android:format12Hour="yyyy-MM-dd EEEE"
+            android:format24Hour="yyyy-MM-dd EEEE"
+            android:text="----"
+            android:textColor="@color/black"
+            android:textSize="@dimen/font_size_18" />
+
+        <ImageView
+            android:id="@+id/view_title_lay_time_img"
+            android:layout_width="@dimen/d20"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@+id/view_title_lay_day_tx"
+            android:layout_marginLeft="@dimen/d20"
+            android:scaleType="centerInside"
+            android:src="@mipmap/shijian" />
+
+        <!--时间-->
+        <TextClock
+            android:id="@+id/view_title_lay_time_tx"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/view_title_lay_time_img"
+            android:layout_marginLeft="@dimen/d4"
+            android:layout_centerVertical="true"
+            android:format12Hour="HH:mm"
+            android:format24Hour="HH:mm"
+            android:text="--:--"
+            android:textColor="@color/black"
+            android:textSize="@dimen/font_size_18" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true">
+            <TextView
+                android:id="@+id/view_title_layout_tv_point"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:background="@mipmap/sip_b"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/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/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/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_nor" />
+
+            <ImageView
+                android:id="@+id/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:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/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" />
+        </LinearLayout>
+
+    </RelativeLayout>
+
     <LinearLayout
         android:id="@+id/view_title_layout_return"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:layout_below="@+id/view_title_layout_ll_right"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="8dp"
         android:layout_marginBottom="4dp"
         android:background="@drawable/shape_main_hos_txt_bg"
         android:clickable="true"
@@ -30,25 +148,31 @@
             android:layout_marginRight="6dp"
             android:background="@mipmap/return_w"
             android:visibility="gone" />
+
         <!--医院名称-->
         <TextView
             android:id="@+id/view_title_layout_tv_hospital_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
             android:ellipsize="marquee"
             android:singleLine="true"
             android:text="----"
             android:textColor="@color/white"
             android:textSize="@dimen/font_size_18" />
+
     </LinearLayout>
 
     <ImageView
         android:id="@+id/view_title_layout_tv_no_img"
         android:layout_width="@dimen/d22"
         android:layout_height="@dimen/d22"
+        android:layout_below="@+id/view_title_layout_ll_right"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="4dp"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
-        android:layout_marginRight="10dp"
         android:layout_toLeftOf="@+id/view_title_layout_tv_no"
         android:background="@mipmap/dun"
         android:visibility="gone" />
@@ -57,133 +181,15 @@
         android:id="@+id/view_title_layout_tv_no"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/view_title_layout_ll_right"
+        android:layout_alignParentRight="true"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
         android:layout_marginRight="10dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="4dp"
         android:text="ID:"
         android:textColor="@color/black"
         android:textSize="@dimen/font_size_18"
         android:visibility="gone" />
-
-    <!--状态图标-->
-    <LinearLayout
-        android:id="@+id/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:id="@+id/view_title_lay_day_img"
-            android:layout_width="@dimen/d18"
-            android:layout_height="@dimen/d18"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:background="@mipmap/riqi" />
-        <!--日期-->
-        <TextClock
-            android:id="@+id/view_title_lay_day_tx"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/d5"
-            android:format12Hour="yyyy-MM-dd EEEE"
-            android:format24Hour="yyyy-MM-dd EEEE"
-            android:text="----"
-            android:textColor="@color/black"
-            android:textSize="@dimen/font_size_18" />
-
-        <ImageView
-            android:id="@+id/view_title_lay_time_img"
-            android:layout_width="@dimen/d18"
-            android:layout_height="@dimen/d18"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/d20"
-            android:layout_marginRight="4dp"
-            android:background="@mipmap/shijian" />
-        <!--时间-->
-        <TextClock
-            android:id="@+id/view_title_lay_time_tx"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/d5"
-            android:layout_marginRight="@dimen/d20"
-            android:format12Hour="HH:mm"
-            android:format24Hour="HH:mm"
-            android:text="--:--"
-            android:textColor="@color/black"
-            android:textSize="@dimen/font_size_18" />
-
-        <!--SIP状态图标-->
-        <!--<TextView
-            android:id="@+id/view_title_layout_tv_sip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:text="SIP"
-            android:textColor="#FF444444"
-            android:visibility="gone" />-->
-
-        <TextView
-            android:id="@+id/view_title_layout_tv_point"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:background="@mipmap/sip_b"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/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/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/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_nor" />
-
-        <ImageView
-            android:id="@+id/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:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/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" />
-
-    </LinearLayout>
 </RelativeLayout>

android_bed/src/main/sharedUserId/AndroidManifest.xml

@@ -60,6 +60,15 @@
     <!-- 如果设配Android9及更低版本，可以申请 ACCESS_COARSE_LOCATION -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.REBOOT"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+    <uses-permission android:name="android.permission.DEVICE_POWER"/>
+    <uses-permission android:name="android.permission.SHUTDOWN"/>
+    <uses-permission android:name="android.permission.SET_TIME"/>
+
     <!-- Needed for full screen intent in incoming call notifications -->
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
 

app/build.gradle

@@ -126,6 +126,11 @@ android {
             dimension "app"
             buildConfigField 'String', 'flag', '"11"'
         }
+
+        rk3288_ym {//外购21.5寸竖屏分机
+            dimension "app"
+            buildConfigField 'String', 'flag', '"12"'
+        }
     }
 
     sourceSets {
@@ -183,6 +188,9 @@ android {
             manifest.srcFile 'src/main/AndroidManifest.xml'
         }
 
+        rk3288_ym {//外购21.5寸竖屏分机
+            manifest.srcFile 'src/main/AndroidManifest.xml'
+        }
     }
     buildTypes {
         release {

bedlib/src/main/java/android_serialport_api/SerialPort.java

@@ -48,7 +48,8 @@ public class SerialPort {
                         mFd = open(device.getAbsolutePath(), baudrate, flags);
                         if (mFd == null) {
                             Log.e(TAG, "native open returns null");
-                            throw new IOException();
+                            return;
+                            //throw new IOException();
                         }
 
                         mFileInputStream = new FileInputStream(mFd);
@@ -61,7 +62,7 @@ public class SerialPort {
                         Log.d(TAG, "open serialPort success: " + device.getAbsolutePath());
                     } catch (Exception e) {
                         e.printStackTrace();
-                        throw new SecurityException();
+                        //throw new SecurityException();
                     }
                 }
             }).start();

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java

@@ -43,6 +43,7 @@ public class Constant {
     public static final String DEV_W_ZX_8 = "8";//外购 中兴8寸
     public static final String DEV_W_PW_10 = "10";//外购普威10寸
     public static final String DEV_W_DCHK_10 = "11";//外购大成慧康10寸，带手柄
+    public static final String DEV_W_RK3288_YM = "12";//外购21.5寸竖屏分机
 
     public static Integer TTSSTATE = 1;
     public static boolean OPEN_DEBUG = true;

resource/src/main/res/values-zh/strings.xml

@@ -82,7 +82,7 @@
     <string name="detect_new_version">检测到新版本，是否升级?</string>
     <string name="new_version_tips">检测到新版本</string>
     <string name="welcome_txt_1">祝您早日康复</string>
-    <string name="welcome_txt_2">坚信不好的总会过 美好的即将到来</string>
+    <string name="welcome_txt_2">坚信不好的总会过去 美好的即将到来</string>
 
 
     <string name="str_home">首页</string>

welcome/src/main/code/com/wdkl/ncs/android/component/welcome/activity/WelcomeActivity.kt

@@ -157,7 +157,7 @@ class WelcomeActivity :BaseActivity<WelcomePresenter, ActivityWelcomeBinding>(),
             if ( BuildConfig.isandroid_bed.toBoolean()){
                 push("/callingbed/activation")
             }else if(BuildConfig.iscallingdoor.toBoolean()){
-                    push("/callingdoor/activation")
+                push("/callingdoor/activation")
             }else if(BuildConfig.isandroid_host.toBoolean()){
                 push("/nursehome/activation")
             }else if(BuildConfig.isandroid_mobile.toBoolean()){