1.分机医护模块tcp修改

2。护士主机紧急弹窗修改
3。门口机国际化
3。门口机医护tcp修改
4。门口机增加本房间呼叫显示
5。门口机增加设备管理

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

@@ -595,7 +595,7 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
                 if (Constant.TCP_CONNECTED) {
                     if (Constant.DEVICE_ID != -1) {
                         OtherUtil.sendReinforce(Constant.DEVICE_ID)
-                        ReinforcementsDialogHelper.showDialog(activity, true)
+                        ReinforcementsDialogHelper.showDialog(activity, 1)
                         SoundPoolManager.getInstance().playSound(4, 1.0f, 1.0f, 0)
                     } else {
                         showMessage("null device id!")
@@ -1642,7 +1642,7 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
                         initDevice()
                     } else if (tcpModel.action == TcpAction.ReinforceAction.RESPONSED) {
                         ReinforcementsDialogHelper.dismiss()
-                        ReinforcementsDialogHelper.showDialog(activity, false)
+                        ReinforcementsDialogHelper.showDialog(activity, 2)
                     } else if (tcpModel.action == TcpAction.SignInAction.SIGN_IN_SUCCESS) {
                         //医护签到 播放语音签到成功
                         SpeechUtil.getInstance().stopSpeak()
@@ -1692,11 +1692,15 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
                             if (!responsed.contains(interactionVO.id)) { //已响应过的事件不在播报
                                 if (Locale.CHINESE.getLanguage().equals(language)) {
                                     val speakStr = (interactionVO.actionEndMemberName
-                                            ?: "") + "已响应" + interactionVO.data + "//请稍候"
+                                            ?: "") + "已响应" + interactionVO.data + "//请稍后"
                                     SpeechUtil.getInstance().stopSpeak()
                                     SpeechUtil.getInstance().speak(speakStr)
+                                    ReinforcementsDialogHelper.dismiss()
+                                    ReinforcementsDialogHelper.showDialog(activity, 3)
                                 } else {
                                     SoundPoolManager.getInstance().playSound(6, 1.0f, 1.0f, 0)
+                                    ReinforcementsDialogHelper.dismiss()
+                                    ReinforcementsDialogHelper.showDialog(activity, 3)
                                 }
                                 responsed.add(interactionVO.id)
                             }

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

@@ -1430,7 +1430,7 @@ class CallingbedMomActivity :BaseActivity<BedCallingbedActivityPresenter, Callin
                         initDevice()
                     } else if (tcpModel.action == TcpAction.ReinforceAction.RESPONSED) {
                         ReinforcementsDialogHelper.dismiss()
-                        ReinforcementsDialogHelper.showDialog(activity, false)
+                        ReinforcementsDialogHelper.showDialog(activity, 2)
                     } else if (tcpModel.action == TcpAction.SignInAction.SIGN_IN_SUCCESS) {
                         //医护签到 播放语音签到成功
                         SpeechUtil.getInstance().stopSpeak()

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
+import android.os.Handler;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,11 +19,30 @@ public class LoadingDialogHelper {
     private static AlertDialog dialog;
 
     public static void showLoadingDialog(final Activity activity) {
+
+
+        if (dialog != null && dialog.isShowing()) {
+            return;
+        }
+        // 倒计时时间（单位：毫秒）
+        long countdownTime = 3000;
+
+        Handler handler = new Handler();
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                if (dialog != null && dialog.isShowing()) {
+                    dialog.dismiss();
+                }
+            }
+        };
         View contentView = LayoutInflater.from(activity).inflate(R.layout.loading_dialog, null);
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         builder.setView(contentView);
 
         dialog = builder.create();
+        dialog.setCanceledOnTouchOutside(true);
+        dialog.setCancelable(true);
         dialog.show();
 
         //设置dialog宽高及位置
@@ -49,6 +69,12 @@ public class LoadingDialogHelper {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        dialog.setOnCancelListener(dialog -> {
+            // 用户点击对话框外部时，取消倒计时任务
+            handler.removeCallbacks(runnable);
+        });
+
+        handler.postDelayed(runnable, countdownTime);
     }
 
     public static void dismissCallDialog() {

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

@@ -24,7 +24,7 @@ public class ReinforcementsDialogHelper {
             alertDialog.dismiss();
         }
     }
-    public static void showDialog(Activity activity ,boolean type) {
+    public static void showDialog(Activity activity ,int type) {
         if (alertDialog != null && alertDialog.isShowing()) {
             return;
         }
@@ -46,14 +46,18 @@ public class ReinforcementsDialogHelper {
         ImageView reinforcements_img = contentView.findViewById(R.id.reinforcements_img);
         TextView reinforcements_tip_text = contentView.findViewById(R.id.reinforcements_tip_text);
         Button reinforcements_confirm_button = contentView.findViewById(R.id.reinforcements_confirm_button);
-        if (type){
+        if (type==1){
             reinforcements_img.setBackgroundResource(R.mipmap.fachu);
             reinforcements_tip_text.setText(R.string.reinforce_sent);
             reinforcements_confirm_button.setBackgroundResource(R.drawable.shape_main_hos_txt_bg);
-        }else {
+        }else if (type==2){
             reinforcements_img.setBackgroundResource(R.mipmap.xiangy);
             reinforcements_tip_text.setText(R.string.reinforce_respond);
             reinforcements_confirm_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg);
+        }else if (type==3){
+            reinforcements_img.setBackgroundResource(R.mipmap.xiangy);
+            reinforcements_tip_text.setText(R.string.reinforce_respond_2);
+            reinforcements_confirm_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg);
         }
         reinforcements_confirm_button.setOnClickListener(v -> {
             if (alertDialog != null && alertDialog.isShowing()) {
@@ -72,4 +76,5 @@ public class ReinforcementsDialogHelper {
 
         handler.postDelayed(runnable, countdownTime);
     }
+
 }

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

@@ -71,8 +71,12 @@ public class SystemDialogHelper {
                     }else if (type==2){
                         //打开底部导航栏
                         HardWareFactory.getHardTools().startbar(true);
-                        //关闭守护进程
-                        ZhylManager.getInstance(BaseApplication.appContext).sys_setDaemonsActivity("",10000,false);
+
+                        if (BuildConfig.flag.equals(Constant.DEV_W_A133)) {
+                            //关闭守护进程
+                            ZhylManager.getInstance(BaseApplication.appContext).sys_setDaemonsActivity("",10000,false);
+                        }
+
 
                         Intent intent = new Intent(Settings.ACTION_SETTINGS);
                         activity.startActivity(intent);

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

@@ -8,6 +8,7 @@ import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.fastjson.JSONObject
 import com.enation.javashop.net.engine.model.NetState
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
+import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.activity.CallingbedActivity
 import com.wdkl.app.ncs.callingbed.adapter.CallRecordsItemAdapter
@@ -278,7 +279,7 @@ class CallRecordsFragment : BaseFragment<BedCallRecordsFragmentPresenter, MainCa
         //发送事件
         //事件处理监听
         if(Constant.TCP_CONNECTED) {
-            LoadingDialogHelper.showLoadingDialog(activity)
+
             //使用新的方式发送事件
             val tcpModel = EventUtil.eventKeyClick(Constant.DEVICE_ID, allOrders.get(keyId).id)
             val transaction: TcpCallback = object : TcpCallback(tcpModel.tid) {
@@ -292,9 +293,13 @@ class CallRecordsFragment : BaseFragment<BedCallRecordsFragmentPresenter, MainCa
                     }
 
                     activity.runOnUiThread {
-                        LoadingDialogHelper.dismissCallDialog()
-
                         (activity as CallingbedActivity).removeRightFragment()
+
+                        if (BuildConfig.device_type.equals("1")){
+                            LoadingDialogHelper.showLoadingDialog(activity)
+                        }else {
+                            ReinforcementsDialogHelper.showDialog(activity, 1)
+                        }
                     }
                 }
                 override fun onSuccess(jsonObject: JSONObject) {
@@ -361,7 +366,7 @@ class CallRecordsFragment : BaseFragment<BedCallRecordsFragmentPresenter, MainCa
         }else if (TcpType.REINFORCE.name == actionType){
             if (Constant.DEVICE_ID != -1 && Constant.TCP_CONNECTED) {
                 OtherUtil.sendReinforce(Constant.DEVICE_ID)
-                ReinforcementsDialogHelper.showDialog(activity , true)
+                ReinforcementsDialogHelper.showDialog(activity , 1)
 //                        WidgetsUtil.showToastWithImage(getString(R.string.support_sent), 200f)
                 SoundPoolManager.getInstance().playSound(4, 1.0f, 1.0f, 0)
             } else {

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

@@ -273,7 +273,7 @@ class  MomCallFragment : BaseFragment<BedMomCallFragmentPresenter, MomCallLayBin
         }else if (TcpType.REINFORCE.name == actionType){
             if (Constant.DEVICE_ID != -1 && Constant.TCP_CONNECTED) {
                 OtherUtil.sendReinforce(Constant.DEVICE_ID)
-                ReinforcementsDialogHelper.showDialog(activity , true)
+                ReinforcementsDialogHelper.showDialog(activity , 1)
 //                        WidgetsUtil.showToastWithImage(getString(R.string.support_sent), 200f)
                 SoundPoolManager.getInstance().playSound(4, 1.0f, 1.0f, 0)
             } else {

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

@@ -108,7 +108,6 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingbedNurseMainBi
             }else{
                 PatrolDialogHelper.showDialog(activity,2, object : PatrolDialogHelper.ClickListener {
                     override fun onClick() {
-                        //bu
                     }
                 })
             }

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

@@ -194,7 +194,7 @@ class SipCallFragment: BaseCallFragment() {
                 if (Constant.TCP_CONNECTED) {
                     if (Constant.DEVICE_ID != -1) {
                         OtherUtil.sendReinforce(Constant.DEVICE_ID)
-                        ReinforcementsDialogHelper.showDialog(activity,true)
+                        ReinforcementsDialogHelper.showDialog(activity,1)
 //                        WidgetsUtil.showToastWithImage(getString(R.string.support_sent), 200f)
                         SoundPoolManager.getInstance().playSound(4, 1.0f, 1.0f, 0)
                     } else {

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

@@ -272,7 +272,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
                 if (Constant.TCP_CONNECTED) {
                     if (Constant.DEVICE_ID != -1) {
                         OtherUtil.sendReinforce(Constant.DEVICE_ID)
-                        ReinforcementsDialogHelper.showDialog(activity,true)
+                        ReinforcementsDialogHelper.showDialog(activity,1)
 //                        WidgetsUtil.showToastWithImage(getString(R.string.support_sent), 200f)
                         SoundPoolManager.getInstance().playSound(4, 1.0f, 1.0f, 0)
                     } else {

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

@@ -1,8 +1,11 @@
 package com.wdkl.ncs.android.component.nursehome.window
 
+import android.app.Activity
 import android.content.Context
+
 import android.graphics.PixelFormat
 import android.os.Build
+import android.text.TextUtils
 import android.view.*
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
@@ -12,30 +15,37 @@ import com.alibaba.android.vlayout.DelegateAdapter
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
+import com.alibaba.fastjson.JSONObject
 import com.google.gson.Gson
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.activity.NurseHomeActivity
-import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.component.nursehome.databinding.AdapterEventListItemBinding
 import com.wdkl.ncs.android.component.nursehome.databinding.WindowIncidentBinding
 import com.wdkl.ncs.android.component.nursehome.settingconfig.SettingConfig
 import com.wdkl.ncs.android.component.nursehome.util.*
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.base.BaseApplication
+import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
+import com.wdkl.ncs.android.lib.utils.showMessage
+import com.wdkl.ncs.android.middleware.api.UrlManager
+import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
+import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
+import com.wdkl.ncs.android.middleware.tcp.channel.EventUtil
+import com.wdkl.ncs.android.middleware.tcp.channel.ImUtil
 import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil
+import com.wdkl.ncs.android.middleware.tcp.dto.TcpCallback
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
-
 import com.wdkl.ncs.android.middleware.utils.StringUtil
 import org.greenrobot.eventbus.EventBus
 
-class IncidentWindow(var contexts: Context) {
+class IncidentWindow(var activity: Activity) {
     var mWindowManager: WindowManager? = null
     var view: View? = null
     var eventTcpList = ArrayList<TcpModel>()
@@ -55,7 +65,6 @@ class IncidentWindow(var contexts: Context) {
             }
         }
 
-
         if (emergency) {
             eventTcpList.add(0, tcpModel)
         } else {
@@ -65,7 +74,7 @@ class IncidentWindow(var contexts: Context) {
         if (view == null) {
             val wmParams = WindowManager.LayoutParams()
             //获取的是WindowManagerImpl.CompatModeWrapper
-            mWindowManager = contexts.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+            mWindowManager = activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
                 //设置window type 这个只能在8.0以下系统使用
                 wmParams.type = WindowManager.LayoutParams.TYPE_PHONE
@@ -77,38 +86,37 @@ class IncidentWindow(var contexts: Context) {
             //设置图片格式，效果为背景透明
             wmParams.format = PixelFormat.RGBA_8888
             //设置浮动窗口不可聚焦（实现操作除浮动窗口外的其他可见窗口的操作）
-            //wmParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+//            wmParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
             //调整悬浮窗显示的停靠位置为左侧置顶
-//        wmParams.gravity = Gravity.RIGHT or Gravity.TOP
-            wmParams.gravity = Gravity.CENTER_HORIZONTAL;
+            //wmParams.gravity = Gravity.RIGHT or Gravity.TOP
+            wmParams.gravity = Gravity.CENTER_HORIZONTAL
             // 以屏幕左上角为原点，设置x、y初始值，相对于gravity
             wmParams.x = 0
             wmParams.y = 0
             //设置悬浮窗口长宽数据
-            wmParams.width = WindowManager.LayoutParams.WRAP_CONTENT
-            wmParams.height = WindowManager.LayoutParams.WRAP_CONTENT
+            wmParams.width = WindowManager.LayoutParams.MATCH_PARENT
+            wmParams.height = WindowManager.LayoutParams.MATCH_PARENT
 
             //获取浮动窗口视图所在布局
-            view = LayoutInflater.from(contexts).inflate(R.layout.window_incident, null)
-            adapter = EventListAdapter(contexts, eventTcpList)
+            view = LayoutInflater.from(activity).inflate(R.layout.window_incident, null)
+            adapter = EventListAdapter(activity, eventTcpList)
             /**初始化LayoutMannager*/
-            virtualLayoutManager = VirtualLayoutManager(contexts)
+            virtualLayoutManager = VirtualLayoutManager(activity)
 
             /**初始化适配器*/
             delegateAdapter = DelegateAdapter(virtualLayoutManager)
             delegateAdapter.addAdapter(adapter)
 
-             var windowIncidentBinding: WindowIncidentBinding
-            windowIncidentBinding = DataBindingUtil.bind(view!!)!!
+            val windowIncidentBinding: WindowIncidentBinding = DataBindingUtil.bind(view!!)!!
             windowIncidentBinding.rvEventList.layoutManager = virtualLayoutManager
             windowIncidentBinding.rvEventList.adapter = delegateAdapter
 
-            var alphaAnimation = AlphaAnimation(1.0f, 0.1f)
+            /*var alphaAnimation = AlphaAnimation(1.0f, 0.1f)
             alphaAnimation.duration = 600
             alphaAnimation.interpolator = LinearInterpolator()
             alphaAnimation.repeatCount = Animation.INFINITE //表示重复多次
             alphaAnimation.repeatMode = Animation.REVERSE //表示动画结束后，反过来再执行;RESTART表示从头开始，REVERSE表示从末尾倒播
-            windowIncidentBinding.viewEventTitle.startAnimation(alphaAnimation)
+            windowIncidentBinding.viewEventTitle.startAnimation(alphaAnimation)*/
 
             //添加mFloatLayout
             mWindowManager!!.addView(view, wmParams)
@@ -117,16 +125,44 @@ class IncidentWindow(var contexts: Context) {
             adapter!!.updateData(eventTcpList)
         }
 
+        //hideSystemUI()
+
         adapter!!.setOnItemClickListener { data, position ->
-            if (SettingConfig.getTtsMode(contexts) == SettingConfig.TTS_ON) {
-                SpeechUtil.getInstance().stopSpeak(true)
-            } else {
+            if (SettingConfig.getTtsMode(activity) == SettingConfig.MUSIC_ON) {
                 RingPlayHelper.stopRingTone()
+            } else {
+                SpeechUtil.getInstance().stopSpeak(true)
             }
+
             val interactionData = Gson().fromJson(data.data.toString(), InteractionVO::class.java)
-            if (interactionData.actionType == TcpType.SOS.name) {
-                //SpeechUtil.getInstance().stopSpeak(true)
-                OtherUtil.cancelSosCallHost(Constant.DEVICE_ID, interactionData.fromDeviceId, interactionData.id)
+            if (interactionData.actionType == TcpType.EVENT.name) {
+                SpeechUtil.getInstance().stopSpeak(true)
+                val eventTcpModel = EventUtil.eventResponse(Constant.DEVICE_ID, interactionData.fromDeviceId, interactionData.id)
+                TcpClient.getInstance().sendMsg(eventTcpModel.toJson())
+            } else if (interactionData.actionType == TcpType.IM.name) {
+                SpeechUtil.getInstance().stopSpeak(true)
+                val imTcpModel = ImUtil.imRead(Constant.DEVICE_ID, interactionData.fromDeviceId, interactionData.id)
+                TcpClient.getInstance().sendMsg(imTcpModel.toJson())
+                MediaPlayHelper.getInstance().playUrlMusic(UrlManager.build().buyer + "/" + interactionData.data, 1.0f, false)
+            } else if (interactionData.actionType == TcpType.SOS.name) {
+                SpeechUtil.getInstance().stopSpeak(true)
+                val cancelTcp = OtherUtil.SOSCancel(Constant.DEVICE_ID, interactionData.fromDeviceId, interactionData.id)
+                val transaction = object : TcpCallback(cancelTcp.tid) {
+                    override fun onSuccess(jsonObject: JSONObject) {
+                        super.onSuccess(jsonObject)
+                        //更新左侧列表
+                        EventBus.getDefault().post(MessageEvent(0, Constant.EVENT_REFRESH_CALL_LIST))
+                    }
+
+                    override fun onFailed(jsonObject: JSONObject) {
+                        // 这里写发送失败的方法
+                        val callbackString = jsonObject.getString(CALLBACK)
+                        showMessage("sos cancel fail: $callbackString")
+                        super.onFailed(jsonObject)
+                    }
+                }
+                TcpClient.getInstance().sendTcp(cancelTcp, false, transaction)
+
                 if (data.action == TcpAction.SOSAction.CALL || tcpModel.action == TcpAction.SOSAction.ROOM_CALL) {
                     LedHelper.updateLedInfo(interactionData, false, true)
                 }
@@ -157,6 +193,28 @@ class IncidentWindow(var contexts: Context) {
 
     }
 
+    private fun hideSystemUI() {
+        // Enables regular immersive mode.
+        // For "lean back" mode, remove SYSTEM_UI_FLAG_IMMERSIVE.
+        // Or for "sticky immersive," replace it with SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+        activity.window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE
+                // Set the content to appear under the system bars so that the
+                // content doesn't resize when the system bars hide and show.
+                or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                // Hide the nav bar and status bar
+                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                or View.SYSTEM_UI_FLAG_FULLSCREEN)
+    }
+
+    // Shows the system bars by removing all the flags
+    // except for the ones that make the content appear under the system bars.
+    private fun showSystemUI() {
+        activity.window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
+    }
 
     /**
      * 删除窗口
@@ -174,9 +232,6 @@ class IncidentWindow(var contexts: Context) {
     }
 
     fun declineItem(item: InteractionVO) {
-        if (SettingConfig.getTtsMode(contexts) != SettingConfig.TTS_ON) {
-            RingPlayHelper.stopRingTone()
-        }
         if(view==null){
             return
         }else if (eventTcpList.size==0){
@@ -233,173 +288,141 @@ class IncidentWindow(var contexts: Context) {
             notifyDataSetChanged()
         }
 
-        override fun onCreateViewHolder(
-            p0: ViewGroup,
-            p1: Int
-        ): BaseRecyclerViewHolder<AdapterEventListItemBinding> {
-            return BaseRecyclerViewHolder.build(p0, R.layout.adapter_event_list_item)
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseRecyclerViewHolder<AdapterEventListItemBinding> {
+            return BaseRecyclerViewHolder.build(parent, R.layout.adapter_event_list_item)
         }
-
-        override fun onBindViewHolder(
-            p0: BaseRecyclerViewHolder<AdapterEventListItemBinding>,
-            p1: Int
-        ) {
-            p0?.bind { binding ->
-                val tcpModel = getItem(p1)
+        override fun onBindViewHolder(holder: BaseRecyclerViewHolder<AdapterEventListItemBinding>, position: Int) {
+            holder?.bind { binding ->
+                val tcpModel = getItem(position)
                 val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                 //房间名称
                 var room = interactionVO.fromFrameFullName.substringBefore("-")
-                //如果分机绑定了紧急按钮则加上紧急按钮名称
-                if (interactionVO.fromDeviceType == DeviceTypeEnum.EMERGENCY_BUTTON.value()
-                    || interactionVO.fromDeviceType == DeviceTypeEnum.SIMULATE_EMERGENCY_BUTTON.value()) {
-                    if (SettingConfig.getSosCallNameOn(BaseApplication.appContext)) {
+                binding.tvAlarmIndex.text = "" + (position+1)
+
+                if (interactionVO.actionType == TcpType.EVENT.name) {
+                    val text = interactionVO.fromFrameFullName + " " + interactionVO.data
+                    binding.incidentTv.text = text
+                    binding.handleImagev.setText(R.string.str_confirm)
+                    binding.handleImagev.setBackgroundResource(R.drawable.sp_event_unhandled_bg)
+                } else if (interactionVO.actionType == TcpType.IM.name) {
+                    val text = interactionVO.fromFrameFullName + " " + BaseApplication.appContext.getString(
+                            R.string.voice_message
+                    )
+                    binding.incidentTv.text = text
+                    binding.handleImagev.text = ""
+                    binding.handleImagev.setBackgroundResource(R.drawable.wei_bo_fang)
+                } else if (interactionVO.actionType == TcpType.REINFORCE.name) {
+                    val text = BaseApplication.appContext.getString(
+                            R.string.reinforce_call_speech,
+                            interactionVO.fromFrameFullName
+                    )
+                    binding.incidentTv.text = text
+                    binding.handleImagev.setText(R.string.str_confirm)
+                    binding.handleImagev.setBackgroundResource(R.drawable.sp_event_unhandled_bg)
+                } else if (interactionVO.actionType == TcpType.SOS.name) {
+                    binding.handleImagev.setText(R.string.str_confirm)
+                    binding.handleImagev.setBackgroundResource(R.drawable.sp_event_unhandled_bg)
+
+                    //如果分机绑定了紧急按钮则加上紧急按钮名称
+                    if (interactionVO.fromDeviceType == DeviceTypeEnum.EMERGENCY_BUTTON.value()
+                            || interactionVO.fromDeviceType == DeviceTypeEnum.SIMULATE_EMERGENCY_BUTTON.value()
+                    ) {
                         room = interactionVO.fromDeviceName
                     }
-                }
 
-                binding.headImagev.setImageResource(R.drawable.yu_yin_tou_xiang)
-                //事件是否已处理
-                if (interactionVO.actionEnd != null) {
-                    if (interactionVO.actionType == TcpType.EVENT.name) {
-                        binding.incidentTv.text = interactionVO.data
-                        binding.handleImagev.setText(R.string.event_done)
-                        binding.handleImagev.setBackgroundResource(R.drawable.sp_event_handled)
-                    } else if (interactionVO.actionType == TcpType.IM.name) {
-                        binding.incidentTv.setText(R.string.voice_message)
-                        binding.handleImagev.text = ""
-                        binding.handleImagev.setBackgroundResource(R.drawable.yi_bo_fang)
-                    } else if (interactionVO.actionType == TcpType.SOS.name) {
-                        binding.headImagev.setImageResource(R.drawable.ic_sos_m)
+                    //紧急呼叫显示data中数据
+                    if (SettingConfig.getSosCallNameOn(BaseApplication.appContext)) {
                         val text = BaseApplication.appContext.getString(R.string.sos_call_speech, room)
                         binding.incidentTv.text = text
-                        binding.handleImagev.setText(R.string.event_done)
-                        binding.handleImagev.setBackgroundResource(R.drawable.sp_event_handled)
-                    } else if (interactionVO.actionType == TcpType.REINFORCE.name) {
-                        val text = BaseApplication.appContext.getString(R.string.reinforce_call_speech, interactionVO.fromFrameFullName)
-                        binding.incidentTv.text = text
-                        binding.handleImagev.setText(R.string.event_done)
-                        binding.handleImagev.setBackgroundResource(R.drawable.sp_event_handled)
-                    }
-                } else {
-                    if (interactionVO.actionType == TcpType.EVENT.name) {
+                    } else if (interactionVO.data != null) {
                         binding.incidentTv.text = interactionVO.data
-                        binding.handleImagev.setText(R.string.event_todo)
-                        binding.handleImagev.setBackgroundResource(R.drawable.sp_event_unhandled_bg)
-                    } else if (interactionVO.actionType == TcpType.IM.name) {
-                        binding.incidentTv.setText(R.string.voice_message)
-                        binding.handleImagev.text = ""
-                        binding.handleImagev.setBackgroundResource(R.drawable.wei_bo_fang)
-                    } else if (interactionVO.actionType == TcpType.REINFORCE.name) {
-                        val text = BaseApplication.appContext.getString(R.string.reinforce_call_speech, interactionVO.fromFrameFullName)
-                        binding.incidentTv.text = text
-                        binding.handleImagev.setText(R.string.event_todo)
-                        binding.handleImagev.setBackgroundResource(R.drawable.sp_event_unhandled_bg)
-                    } else if (interactionVO.actionType == TcpType.SOS.name) {
-                        binding.handleImagev.setText(R.string.event_todo)
-                        binding.handleImagev.setBackgroundResource(R.drawable.sp_event_unhandled_bg)
-                        binding.headImagev.setImageResource(R.drawable.ic_sos_m)
-
-                        //紧急呼叫显示data中数据
-                        if (interactionVO.data != null) {
-                            binding.incidentTv.text = interactionVO.data
-                        } else {
-                            if (tcpModel.action == TcpAction.SOSAction.CALL || tcpModel.action == TcpAction.SOSAction.ROOM_CALL) {
-                                val text = BaseApplication.appContext.getString(
-                                    R.string.sos_call_speech,
-                                    room
-                                )
-                                binding.incidentTv.text = text
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_TEST) {
-                                //测试报警
-                                binding.incidentTv.text = TcpAction.SOSAction.ALARM_TEST.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_INTRUSION) {
-                                //入侵报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_INTRUSION.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_ON_EIGHT_HOURS) {
-                                //8小时无人报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_ON_EIGHT_HOURS.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_ON_TWELVE_HOURS) {
-                                //12小时报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_ON_TWELVE_HOURS.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_ON_TWENTY_FOUR_HOURS) {
-                                //24小时无人报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_ON_TWENTY_FOUR_HOURS.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_INFRARED_NO_TRIGGER) {
-                                //无人报警
-                                var str = ""
-                                if (interactionVO.data != null) {
-                                    str = interactionVO.data as String
-                                }
-                                binding.incidentTv.text =
-                                    str + BaseApplication.appContext.getString(R.string.none_warning)
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_FALL_RADAR) {
-                                //雷达跌倒报警
-                                var str = StringUtil.getResString(R.string.str_fall_alarm)
-                                /*if (interactionVO.data != null) {
-                                str = interactionVO.fromDeviceName + (interactionVO.data as String)
-                            }*/
-                                binding.incidentTv.text = room + str
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_INFUSION_RADAR) {
-                                //输液报警
-                                if (interactionVO.data != null) {
-                                    val str = interactionVO.data as String
-                                    binding.incidentTv.text = str
-                                }
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_DISASSEMBLE) {
-                                //防拆报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_DISASSEMBLE.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_FAULT) {
-                                //故障报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_FAULT.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_DOOR_LOCK) {
-                                //门磁报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_DOOR_LOCK.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_SMOKE) {
-                                //烟感报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_SMOKE.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_GAS) {
-                                //燃气报警
-                                binding.incidentTv.text = TcpAction.SOSAction.ALARM_GAS.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_WATER_OVERFLOW) {
-                                //浸水报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_WATER_OVERFLOW.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_LOW_VOLTAGE) {
-                                //低电压报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_LOW_VOLTAGE.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_TEMPERATURE) {
-                                //温度报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_TEMPERATURE.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_FALL) {
-                                //跌倒报警
-                                binding.incidentTv.text = TcpAction.SOSAction.ALARM_FALL.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.ALARM_VITAL) {
-                                //体征报警
-                                binding.incidentTv.text =
-                                    TcpAction.SOSAction.ALARM_VITAL.description
-                            } else if (tcpModel.action == TcpAction.SOSAction.AlARM_BUTTON) {
-                                //腕表紧急按钮
-                                val text = BaseApplication.appContext.getString(
+                    } else {
+                        if (tcpModel.action == TcpAction.SOSAction.CALL || tcpModel.action == TcpAction.SOSAction.ROOM_CALL) {
+                            val text = BaseApplication.appContext.getString(R.string.sos_call_speech, room)
+                            binding.incidentTv.text = text
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_TEST) {
+                            //测试报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_TEST.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_INTRUSION) {
+                            //入侵报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_INTRUSION.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_ON_EIGHT_HOURS) {
+                            //8小时无人报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_ON_EIGHT_HOURS.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_ON_TWELVE_HOURS) {
+                            //12小时报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_ON_TWELVE_HOURS.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_ON_TWENTY_FOUR_HOURS) {
+                            //24小时无人报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_ON_TWENTY_FOUR_HOURS.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_INFRARED_NO_TRIGGER) {
+                            //无人报警
+                            var str = ""
+                            if (interactionVO.data != null) {
+                                str = interactionVO.data as String
+                            }
+                            binding.incidentTv.text = str + BaseApplication.appContext.getString(R.string.none_warning)
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_FALL_RADAR) {
+                            //雷达跌倒报警
+                            binding.incidentTv.text = room + StringUtil.getResString(R.string.str_fall_alarm)
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_INFUSION_RADAR) {
+                            //输液报警
+                            if (interactionVO.data != null) {
+                                val str = interactionVO.data as String
+                                binding.incidentTv.text = str
+                            }
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_DISASSEMBLE) {
+                            //防拆报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_DISASSEMBLE.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_FAULT) {
+                            //故障报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_FAULT.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_DOOR_LOCK) {
+                            //门磁报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_DOOR_LOCK.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_RESTRAINT_BAND) {
+                            //约束带报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_RESTRAINT_BAND.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_SMOKE) {
+                            //烟感报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_SMOKE.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_GAS) {
+                            //燃气报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_GAS.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_WATER_OVERFLOW) {
+                            //浸水报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_WATER_OVERFLOW.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_LOW_VOLTAGE) {
+                            //低电压报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_LOW_VOLTAGE.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_TEMPERATURE) {
+                            //温度报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_TEMPERATURE.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_FALL) {
+                            //跌倒报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_FALL.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.ALARM_VITAL) {
+                            //体征报警
+                            binding.incidentTv.text = TcpAction.SOSAction.ALARM_VITAL.description
+                        } else if (tcpModel.action == TcpAction.SOSAction.AlARM_BUTTON) {
+                            //腕表紧急按钮
+                            binding.incidentTv.text = BaseApplication.appContext.getString(
                                     R.string.sos_call_speech,
                                     interactionVO.fromMemberName
-                                )
-                                binding.incidentTv.text = text
-                            }
+                            )
                         }
                     }
                 }
             }
         }
+
+        override fun onBindViewHolder(holder: BaseRecyclerViewHolder<AdapterEventListItemBinding>, p1: Int, payloads: MutableList<Any>) {
+
+        }
+
+
+
+
     }
 
 }

android_host/src/main/res/layout/adapter_event_list_item.xml

@@ -3,37 +3,33 @@
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp">
-
-        <ImageView
-            android:id="@+id/head_imagev"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:src="@drawable/ic_sos_m" />
+        android:layout_height="80dp"
+        android:layout_marginTop="4dp">
 
         <TextView
-            android:id="@+id/name_tv"
-            android:layout_width="wrap_content"
+            android:id="@+id/tv_alarm_index"
+            android:layout_width="80dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
-            android:layout_toRightOf="@+id/head_imagev"
             android:gravity="center"
-            android:text="SOS"
-            android:textColor="@color/red_color"
-            android:textSize="30sp"
-            android:visibility="gone"/>
+            android:background="@color/color_gray"
+            android:textColor="@color/black"
+            android:textSize="30sp"/>
 
-        <TextView
+        <com.wdkl.ncs.android.lib.widget.MarqueeTextView
             android:id="@+id/incident_tv"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="40dp"
-            android:layout_toRightOf="@id/name_tv"
-            android:gravity="center"
+            android:layout_toLeftOf="@+id/handle_imagev"
+            android:layout_toRightOf="@+id/tv_alarm_index"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:gravity="center_vertical"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="-1"
+            android:singleLine="true"
+            android:textColor="@color/black"
             android:textSize="32sp" />
 
         <TextView
@@ -48,14 +44,5 @@
             android:background="@drawable/sp_event_unhandled_bg"
             android:textSize="20sp"/>
 
-        <TextView
-            android:id="@+id/incident_time"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginRight="20dp"
-            android:layout_toLeftOf="@id/handle_imagev"
-            android:gravity="center"
-            android:textSize="20sp"
-            android:visibility="gone"/>
     </RelativeLayout>
 </layout>

android_host/src/main/res/layout/window_incident.xml

@@ -1,25 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="720dp"
-        android:layout_height="400dp"
-        android:background="@drawable/alert_window_bg">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="720dp"
+            android:layout_height="480dp"
+            android:layout_gravity="center"
+            android:elevation="10dp"
+            app:cardCornerRadius="10dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/alarm_bg"
+                android:paddingLeft="4dp"
+                android:paddingTop="10dp"
+                android:paddingRight="4dp"
+                android:paddingBottom="10dp">
+
+
+            <TextView
+                android:id="@+id/tv_alarm_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/str_alarm_title"
+                android:textColor="@color/color_alarm"
+                android:textSize="48sp"
+                android:textStyle="bold"
+                android:visibility="gone"/>
+
+            <ImageView
+                android:id="@+id/iv_notify_img"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:layout_below="@id/tv_alarm_title"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="10dp"
+                android:scaleType="fitXY"
+                android:src="@drawable/notify_img" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@id/iv_notify_img"
+                android:layout_marginTop="20dp"
+                android:background="@color/color_white"
+                android:orientation="vertical">
 
         <TextView
             android:id="@+id/view_event_title"
-            android:layout_width="720dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="8dp"
+            android:background="@color/color_gray"
             android:gravity="center"
-            android:text="@string/new_event_title"
-            android:textColor="@color/color_red"
-            android:textSize="48sp"/>
+            android:padding="4dp"
+            android:text="@string/str_alarm_list"
+            android:textColor="@color/black"
+            android:textSize="36sp"
+            android:textStyle="bold" />
+
 
-        <LinearLayout
-            android:layout_width="720dp"
-            android:layout_height="320dp"
-            android:layout_marginTop="80dp"
-            android:gravity="center">
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_event_list"
                 android:layout_width="match_parent"
@@ -28,7 +72,9 @@
                 android:scrollbarSize="10dp"
                 android:fadeScrollbars="false"
                 android:scrollbarStyle="insideOverlay"/>
-        </LinearLayout>
 
+            </LinearLayout>
+            </RelativeLayout>
+        </androidx.cardview.widget.CardView>
     </FrameLayout>
 </layout>

android_host/src/main/res/values-es/strings.xml

@@ -51,8 +51,7 @@
     <string name="cost_subtotal">Subtotal: %f</string>
     <string name="exam_desc">Descripción: %s</string>
     <string name="exam_time">Hora: %s</string>
-    <string name="empty_bed">Cama vacía</string>
-    <string name="empty">nulo</string>
+
     <string name="call_wait">Por favor espere</string>
     <string name="no_custom">Cama vacía o sin dispositivo, llamada fallida</string>
     <string name="no_device">No device</string>
@@ -289,6 +288,11 @@
     <string name="trusteeship_title">Lista de Anfitriones de Tutela</string>
     <string name="trusteeship_message">Confirmar llamada al anfitrión</string>
 
+    <string name="str_alarm_title">ALARMA</string>
+    <string name="str_alarm_list">LISTA DE ALARMAS</string>
+    <string name="str_emergency_list">Lista de Emergencias</string>
+    <string name="str_blue_code_list">Lista de Códigos Azules</string>
+
 
 
 

android_host/src/main/res/values-ru/strings.xml

@@ -52,8 +52,7 @@
     <string name="cost_subtotal">Итого: %f</string>
     <string name="exam_desc">Описание: %s</string>
     <string name="exam_time">Время: %s</string>
-    <string name="empty_bed">Нет</string>
-    <string name="empty">ноль</string>
+
     <string name="call_wait">Пожалуйста, подождите</string>
     <string name="no_custom">Нет пользовательских настроек или устройств, ошибка вызова</string>
     <string name="no_device">Нет устройства</string>
@@ -294,6 +293,12 @@
     <string name="trusteeship_message">Подтвердить вызов хоста</string>
 
 
+    <string name="str_alarm_title">ALARM</string>
+    <string name="str_alarm_list">Alarm List</string>
+    <string name="str_emergency_list">Emergency List</string>
+    <string name="str_blue_code_list">BlueCode List</string>
+
+
 
 
 

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

@@ -50,8 +50,7 @@
     <string name="cost_subtotal">小计: %f</string>
     <string name="exam_desc">描述: %s</string>
     <string name="exam_time">检验时间: %s</string>
-    <string name="empty_bed">空床位</string>
-    <string name="empty">无</string>
+
     <string name="call_wait">请稍后</string>
     <string name="no_custom">床位未入住或未绑定设备，无法呼叫</string>
     <string name="no_device">没有设备，无法呼叫</string>
@@ -298,4 +297,9 @@
 
     <string name="trusteeship_title">托管主机列表</string>
     <string name="trusteeship_message">确认呼叫主机</string>
+
+    <string name="str_alarm_title">提醒</string>
+    <string name="str_alarm_list">提醒列表</string>
+    <string name="str_emergency_list">紧急列表</string>
+    <string name="str_blue_code_list">BlueCode列表</string>
 </resources>

android_host/src/main/res/values/colors.xml

@@ -18,4 +18,6 @@
     <color name="register_text_color">#969696</color>
 
     <color name="color_critical">#FFEA3A3D</color>
+
+    <color name="color_alarm">#2F51F5</color>
 </resources>

android_host/src/main/res/values/strings.xml

@@ -51,8 +51,7 @@
     <string name="cost_subtotal">Subtotal: %f</string>
     <string name="exam_desc">Desc: %s</string>
     <string name="exam_time">Time: %s</string>
-    <string name="empty_bed">Null</string>
-    <string name="empty">null</string>
+
     <string name="call_wait">Please wait</string>
     <string name="no_custom">No custom or no device, call fail</string>
     <string name="no_device">No device</string>
@@ -299,6 +298,11 @@
     <string name="trusteeship_title">Trusteeship Host List</string>
     <string name="trusteeship_message">Confirm calling host</string>
 
+    <string name="str_alarm_title">ALARM</string>
+    <string name="str_alarm_list">Alarm List</string>
+    <string name="str_emergency_list">Emergency List</string>
+    <string name="str_blue_code_list">BlueCode List</string>
+
 
 
 </resources>

build.gradle

@@ -47,9 +47,9 @@ buildscript {
     /**
      * 配置要打包的模块
      */
-    ext.callingdoor = false
+    ext.callingdoor = true
     ext.android_bed = false
-    ext.android_host = true
+    ext.android_host = false
     ext.android_mobile = false
     ext.android_visiting = false
     ext.is_mom = false
@@ -69,9 +69,9 @@ buildscript {
     ext.sleep_type = "0"
 
     //声网探视
-    ext.is_agora = true
+    ext.is_agora = false
     //广播
-    ext.is_broadcast =true
+    ext.is_broadcast =false
 
 
 

callingdoor/src/main/AndroidManifest.xml

@@ -62,6 +62,11 @@
             android:turnScreenOn="true"
             android:screenOrientation="nosensor"
             android:launchMode="singleTask"/>
+
+        <activity android:name="com.wdkl.app.ncs.callingdoor.activity.DeviceSystemActivity"
+            android:turnScreenOn="true"
+            android:screenOrientation="nosensor"
+            android:launchMode="singleTask"/>
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivationActivity.kt

@@ -45,10 +45,12 @@ import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum
 import com.wdkl.ncs.android.middleware.udp.ServerInfoUtil
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import kotlinx.android.synthetic.main.callingdoor_activation.*
+import kotlinx.android.synthetic.main.main_view_layout.*
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import java.util.*
 import java.util.concurrent.TimeUnit
 
 /**
@@ -68,7 +70,14 @@ class CallingdoorActivationActivity  : BaseActivity<CallingdoorActivationPresent
     private var cancelRestart = false
 
     override fun getLayId(): Int {
-       return R.layout.callingdoor_activation
+//        val currentLanguage: String = Locale.getDefault().getLanguage()
+//        if (currentLanguage.equals("es")){
+//            return R.layout.callingdoor_activation
+//        }else{
+//
+//        }
+        return R.layout.callingdoor_activation
+
     }
 
     override fun bindDagger() {
@@ -119,7 +128,7 @@ class CallingdoorActivationActivity  : BaseActivity<CallingdoorActivationPresent
         }
         //系统设置
         activation_system_button.setOnClickListener {
-            SystemDialogHelper.showDialog(activity)
+            SystemDialogHelper.showDialog(activity,1)
         }
         //服务器设置
         activation_services_button.setOnClickListener {
@@ -138,15 +147,15 @@ class CallingdoorActivationActivity  : BaseActivity<CallingdoorActivationPresent
         //设置二维码
         setQrcode()
         val isActivation = SPUtils.get(this, Constant.APP_ACTIVATION, "");
-        if (isActivation.equals("已激活")){
-            activation_title.setText("系统连接失败")
+        if (isActivation.equals("Activated")){
+            activation_title.setText(R.string.connect_server_failed)
             activation_title.setTextColor(resources.getColor(R.color.red_color))
-            activation_title_msg.setText("请检查网络与服务器地址")
+            activation_title_msg.setText(R.string.connect_check)
             activation_title.setTextColor(resources.getColor(R.color.red_color))
         }else{
-            activation_title.setText("请先激活设备")
+            activation_title.setText(R.string.str_check_activation)
             activation_title.setTextColor(resources.getColor(R.color.white))
-            activation_title_msg.setText("设置右侧参数后激活")
+            activation_title_msg.setText(R.string.str_set_active_param)
             activation_title.setTextColor(resources.getColor(R.color.white))
         }
         //注册方式
@@ -159,10 +168,25 @@ class CallingdoorActivationActivity  : BaseActivity<CallingdoorActivationPresent
         activation_zcm.text=  Constant.DEVICE_REGISTER_ID
         val buildUrl = UrlManager.build()
         activation_fuq.text=   buildUrl.buyer.substringAfterLast("//").substringBefore(":")
+        val currentLanguage: String = Locale.getDefault().getLanguage()
+        if (currentLanguage.equals("es") ){
+            //西班牙语
+            activation_system_button.setTextSize(12f)
+            activation_services_button.setTextSize(12f)
+        }else if (currentLanguage.equals("en")){
+//            //英语
+//            activation_system_button.setTextSize(20f)
+//            activation_services_button.setTextSize(20f)
+        }else if (currentLanguage.equals("ru")){
+            //俄语
+            activation_system_button.setTextSize(12f)
+            activation_services_button.setTextSize(12f)
+        }
+
     }
      fun setfuq(){
          activation_fuq.text=CommonUtils.getUrl(this)
-         showMessage("请重启设备，重新激活设备")
+         showMessage(R.string.str_reboot_active)
     }
 
     //设置二维码

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -25,6 +25,7 @@ import com.wdkl.app.ncs.callingdoor.helper.*
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
 import com.wdkl.app.ncs.callingdoor.service.WdklSipService
 import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+import com.wdkl.app.ncs.callingdoor.util.SPUtils
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.core.locale.LocaleMangerUtils
@@ -58,6 +59,7 @@ import com.wdkl.ncs.janus.util.JanusConstant
 import kotlinx.android.synthetic.main.callingdoor_main_lay.*
 import kotlinx.android.synthetic.main.callingdoor_main_lay_rk3288.*
 import kotlinx.android.synthetic.main.callingdoor_main_new.*
+import kotlinx.android.synthetic.main.main_view_layout.*
 import kotlinx.android.synthetic.main.view_bed_name.*
 import kotlinx.android.synthetic.main.view_title_layout.*
 import org.greenrobot.eventbus.EventBus
@@ -216,7 +218,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         //3288 10.1寸竖屏：width=800,  height=1280
         Log.d(TAG, "device orientation: ${Constant.DEVICE_ORIENTATION}, width: ${dm.widthPixels}, height: ${dm.heightPixels}")
         //显示分机呼叫
-//        startScheduledExecutor()
+        startScheduledExecutor()
     }
 
     //检查launch版本
@@ -1317,6 +1319,14 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                             //紧急呼叫已处理
                             HardWareFactroy.getHardTools().setSOSStop()
                         }
+                    }else if (tcpModel.type == TcpType.AUTH) {
+                        if (tcpModel.action == TcpAction.AuthAction.LOGIN) {
+                            val json = JSONObject.parseObject(tcpModel.data.toString())
+                            val auth_id = json.getString("id")
+                            //登录回复
+                            SPUtils.put(this, Constant.YH_ID, auth_id)
+                            startYhMode()
+                        }
                     } else if (tcpModel.type == TcpType.DEVICE) {
                         //检查APP版本
                         if (tcpModel.getAction() == TcpAction.DeviceAction.APP_UPDATE) {
@@ -1354,17 +1364,19 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                         //重新加载数据
                         initDevice()
                     } else if (tcpModel.type == TcpType.SIDE) {
+                        val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                         if (tcpModel.action == TcpAction.SideAction.NURSING) {
-                            val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
+
                             nursingInteId = interactionVO.id
                             SettingConfig.setNursingId(activity, nursingInteId)
                             SerialPortHelper.setDoorLight(1, Constant.nursingColor) //绿色
                         } else if (tcpModel.action == TcpAction.SideAction.SHOW || tcpModel.action == TcpAction.SideAction.CLEAR) {
                             updateCallInfo(tcpModel)
-                        } else {
-                            /*if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL)) {
-                                DoorLightHelper.handleDoorLight(tcpModel)
-                            }*/
+                        } else if (tcpModel.action == TcpAction.SideAction.CALL ) {
+                            updateBedCall(interactionVO, true)
+                        }else if (tcpModel.action == TcpAction.SideAction.ACCEPT ||tcpModel.action == TcpAction.SideAction.CANCEL ) {
+                            updateBedCall(interactionVO, false)
+                        }else{
                             callControl(tcpModel)
                         }
                     } else if (tcpModel.action == TcpAction.TimeAction.SYNC && tcpModel.type == TcpType.TIME) {
@@ -1588,7 +1600,6 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             view_title_layout_iv_bt.visibility = View.GONE
         }
 
-
     }
 
     private fun updateTcpState() {

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/DepartmentInfoActivity.kt

@@ -66,7 +66,7 @@ class DepartmentInfoActivity : BaseActivity<HospitalInfoActivityPresenter, Calli
         view_title_layout_tv_hospital_name.setText(R.string.str_back)
         view_title_layout_img.visibility = View.VISIBLE
         view_title_layout_tv_no.visibility = View.VISIBLE
-        view_title_layout_tv_no.text ="科室介绍"
+        view_title_layout_tv_no.text =getString(R.string.department_info)
         val orientation = resources.configuration.orientation
         if (orientation == Configuration.ORIENTATION_PORTRAIT) {
             // 竖屏模式

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

@@ -0,0 +1,231 @@
+package com.wdkl.app.ncs.callingdoor.activity
+
+import android.content.res.Configuration
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.RadioGroup
+import android.widget.Toast
+import com.enation.javashop.net.engine.model.NetState
+import com.wdkl.app.ncs.callingdoor.BuildConfig
+import com.wdkl.app.ncs.callingdoor.R
+import com.wdkl.app.ncs.callingdoor.databinding.CallingbedDeviceSysBinding
+import com.wdkl.app.ncs.callingdoor.dialog.CallConfigDialogHelper
+import com.wdkl.app.ncs.callingdoor.dialog.SystemDialogHelper
+import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper
+import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
+import com.wdkl.app.ncs.callingdoor.service.WdklSipService
+import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
+
+import com.wdkl.ncs.android.lib.base.BaseActivity
+import com.wdkl.ncs.android.lib.core.locale.LocaleMangerUtils
+import com.wdkl.ncs.android.lib.core.locale.SettingConfigNew
+import com.wdkl.ncs.android.lib.utils.showMessage
+import com.wdkl.ncs.android.lib.vo.filter
+import com.wdkl.ncs.android.lib.widget.VoiceLoadingView.dip2px
+import com.wdkl.ncs.android.middleware.common.Constant
+import com.wdkl.ncs.android.middleware.common.MessageEvent
+import com.wdkl.ncs.android.middleware.logic.contract.callingbed.BedTextActivityContract
+import com.wdkl.ncs.android.middleware.logic.presenter.callingbed.BedTextActivityPresenter
+import kotlinx.android.synthetic.main.callingbed_device_sys.*
+
+import kotlinx.android.synthetic.main.view_title_layout.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+/**
+ * 设备配置界面
+ * */
+class DeviceSystemActivity : BaseActivity<BedTextActivityPresenter, CallingbedDeviceSysBinding>(), BedTextActivityContract.View , View.OnClickListener{
+
+    private val TAG = "DeviceSystemActivity"
+
+    private var selectIndex: Int = 0
+    private var selectIndex1: Int = 0
+
+    override fun getLayId(): Int {
+        return R.layout.callingbed_device_sys
+    }
+
+    override fun bindDagger() {
+        CallingdoorLaunch.component.inject(this)
+    }
+
+    override fun init() {
+        showui()
+        val originIndex1 = SettingConfig.getScene(activity)
+        val adapter1 = ArrayAdapter.createFromResource(activity,
+                R.array.device_list, R.layout.spinner_item)
+        adapter1.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        device_sys_ed_1.setAdapter(adapter1)
+        device_sys_ed_1.setSelection(originIndex1)
+
+        device_sys_ed_1.setOnItemSelectedListener(object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                Log.d("languageId", "pos: $position")
+                selectIndex1 = position
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        })
+
+
+        val originIndex = LocaleMangerUtils.getCurrentLocaleIndex()
+        val adapter = ArrayAdapter.createFromResource(activity,
+                R.array.language_list, R.layout.spinner_item)
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        device_sys_ed_2.setAdapter(adapter)
+        device_sys_ed_2.setSelection(originIndex)
+        device_sys_ed_2.setOnItemSelectedListener(object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                Log.d("languageId", "pos: $position, originIndex: $originIndex")
+                selectIndex = position
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        })
+
+//
+//        if(SettingConfigNew.getLanguageId(activity)==0){
+//            device_sys_ed_1.setHint(R.string.language_list_1)
+//        }else if (SettingConfigNew.getLanguageId(activity)==1){
+//            device_sys_ed_1.setHint(R.string.language_list_2)
+//        }else if (SettingConfigNew.getLanguageId(activity)==2){
+//            device_sys_ed_1.setHint(R.string.language_list_3)
+//        }else if (SettingConfigNew.getLanguageId(activity)==3){
+//            device_sys_ed_1.setHint(R.string.language_list_4)
+//        }else if (SettingConfigNew.getLanguageId(activity)==4){
+//            device_sys_ed_1.setHint(R.string.language_list_5)
+//        }
+
+        val mode = SettingConfigNew.getLanguageMode(activity)
+        if (mode == 0) {
+            device_sys_radio_language_on.setChecked(true)
+        } else {
+            device_sys_radio_language_off.setChecked(true)
+        }
+
+
+        val orientation = resources.configuration.orientation
+        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            // 当前是横屏
+            device_sys_radio_window_on.setChecked(true)
+        } else {
+            // 当前是竖屏
+            device_sys_radio_window_off.setChecked(true)
+        }
+
+        device_sys_save_settings_tv.setOnClickListener(this)
+        device_sys_language_settings_tv.setOnClickListener(this)
+        device_sys_system_settings_tv.setOnClickListener(this)
+        device_sys_software_and_information_tv.setOnClickListener(this)
+    }
+
+    override fun bindEvent() {
+        //返回上一层
+        view_title_layout_return.setOnClickListener {
+            view_title_layout_img.visibility = View.GONE
+            view_title_layout_tv_no.visibility =View.GONE
+            finish()
+        }
+
+        device_sys_group_sip.setOnCheckedChangeListener(RadioGroup.OnCheckedChangeListener { group, checkedId ->
+            if (checkedId == R.id.device_sys_radio_language_on) {
+                SettingConfigNew.setLanguageMode(activity, 0)
+            } else {
+                SettingConfigNew.setLanguageMode(activity, 1)
+            }
+        })
+
+    }
+
+    override fun destory() {
+
+    }
+
+
+
+    private fun showui(){
+        view_title_layout_tv_hospital_name.setText(R.string.str_back)
+        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)
+    }
+
+
+    override fun onStart() {
+        EventBus.getDefault().register(this)
+        super.onStart()
+    }
+
+    override fun onStop() {
+        WdklSipService.sipTesting = false
+        EventBus.getDefault().unregister(this)
+        super.onStop()
+    }
+
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onMoonEvent(messageEvent: MessageEvent) {
+
+    }
+
+
+
+    //数据加载错误
+    override fun onError(message: String, type: Int) {
+
+    }
+    //数据加载完成
+    override fun complete(message: String, type: Int) {
+
+    }
+
+    //开始获取数据
+    override fun start() {
+        //
+    }
+
+    //网络监听
+    override fun networkMonitor(state: NetState) {
+        state.filter(onMobile = {
+
+        }, onWifi = {
+
+        }, offline = {
+
+        })
+    }
+
+    override fun onClick(p0: View?) {
+        when (p0?.id) {
+            //保存设置
+            R.id.device_sys_save_settings_tv -> {
+                SettingConfigNew.setLanguageId(activity, selectIndex)
+                SettingConfig.setScene(activity, selectIndex1)
+                Toast.makeText(activity, "restart now...", Toast.LENGTH_LONG).show()
+                Handler().postDelayed({ AppUpdateHelper.restartApp(activity) }, 3000)
+            }
+            //通话设置
+            R.id.device_sys_language_settings_tv -> {
+                if (BuildConfig.flag.equals(Constant.DEV_W_A133)) {
+                    CallConfigDialogHelper.showDialog(activity)
+                } else {
+                    showMessage(R.string.device_not_support)
+                }
+
+            }
+            //进入设置
+            R.id.device_sys_system_settings_tv -> {
+                SystemDialogHelper.showDialog(activity, 2)
+            }
+            //关于主机
+            R.id.device_sys_software_and_information_tv -> {
+
+            }
+        }
+    }
+}

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/HospitalInfoActivity.kt

@@ -62,7 +62,7 @@ class HospitalInfoActivity : BaseActivity<HospitalInfoActivityPresenter, Calling
         view_title_layout_tv_hospital_name.setText(R.string.str_back)
         view_title_layout_img.visibility = View.VISIBLE
         view_title_layout_tv_no.visibility = View.VISIBLE
-        view_title_layout_tv_no.text ="医院介绍"
+        view_title_layout_tv_no.text =getString(R.string.hospital_info)
         val orientation = resources.configuration.orientation
         if (orientation == Configuration.ORIENTATION_PORTRAIT) {
             // 竖屏模式

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

@@ -42,7 +42,7 @@ class SetHintActivity : BaseActivity<SetHintActivityPresenter, CallingdoorNurseM
     var text = ""
     var  set_time : Int= 0
     var times : Int= 0
-
+    var id = ""
     var timer1: CountDownTimer? = null
 
     override fun getLayId(): Int {
@@ -55,7 +55,7 @@ class SetHintActivity : BaseActivity<SetHintActivityPresenter, CallingdoorNurseM
 
     override fun init() {
         passno = SPUtils.get(this, Constant.YH_NO, "") as String
-
+        id = SPUtils.get(this, Constant.YH_ID, "") as String
         yh_name = SPUtils.get(this, Constant.YH_NAME, "")as String
         showui()
         rv_tips_main_view.visibility = View.GONE
@@ -156,7 +156,7 @@ class SetHintActivity : BaseActivity<SetHintActivityPresenter, CallingdoorNurseM
 
         nurse_msg_bt.setOnClickListener {
             if (set_time<=0 ||  nurse_msg_ed.text.equals("")) {
-                showMessage("倒计时的设定时间不能少于1分钟且必须提示语不能为空")
+                showMessage(R.string.hint_countdown_time_type_error)
                 return@setOnClickListener
             }
             var time = set_time.toLong()
@@ -170,7 +170,7 @@ class SetHintActivity : BaseActivity<SetHintActivityPresenter, CallingdoorNurseM
                     msg_ll.visibility = View.GONE
                     timer1?.cancel()
                     //退出护理 直接回到首页。
-                    YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, passno)
+                    YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, id.toInt())
                     (activity as CallingdoorActivity).BackMain()
                 }
             }.start()
@@ -181,7 +181,38 @@ class SetHintActivity : BaseActivity<SetHintActivityPresenter, CallingdoorNurseM
             YhUtil.sendScreenTip(Constant.DEVICE_ID, passno,nurse_msg_ed.text.toString(),times.toString())
             msg_ll.visibility= View.VISIBLE
             msg_view_title_layout_img.visibility = View.VISIBLE
-            msg_view_title_layout_tv_hospital_name.text = "退出提示"
+            msg_view_title_layout_tv_hospital_name.text = getString(R.string.exit_hint)
+             //网络图标
+            if ( Constant.network_state == 1){
+                msg_view_title_layout_iv_wifi.visibility = View.VISIBLE
+                msg_view_title_layout_iv_ethernet.visibility = View.GONE
+                msg_view_title_layout_iv_wifi.setImageResource(R.mipmap.ic_wifi_fail)
+            }else if ( Constant.network_state == 2){
+                msg_view_title_layout_iv_wifi.visibility = View.GONE
+                msg_view_title_layout_iv_ethernet.visibility = View.VISIBLE
+                msg_view_title_layout_iv_ethernet.setImageResource(R.mipmap.ic_ethernet_success_w)
+            }else{
+                msg_view_title_layout_iv_wifi.visibility = View.GONE
+                msg_view_title_layout_iv_ethernet.visibility = View.VISIBLE
+                msg_view_title_layout_iv_ethernet.setImageResource(R.mipmap.ic_ethernet_fail)
+            }
+            //蓝牙图标
+            if ( Constant.BT_state == 0){
+                msg_view_title_layout_iv_bt.setImageResource(R.mipmap.lanya_b)
+            }
+            //白天/黑夜
+            if (Constant.day_state == 0){
+                msg_view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_daylight_w)
+            }else{
+                msg_view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_night_w)
+            }
+            if(Constant.TCP_CONNECTED){
+                msg_view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_fail)
+            }else{
+                msg_view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_nor)
+            }
+
+
         }
 
         msg_view_title_layout_return.setOnClickListener {
@@ -239,7 +270,7 @@ class SetHintActivity : BaseActivity<SetHintActivityPresenter, CallingdoorNurseM
         view_title_layout_tv_hospital_name.setText(R.string.str_back)
         view_title_layout_img.visibility = View.VISIBLE
         view_title_layout_tv_no.visibility = View.VISIBLE
-        view_title_layout_tv_no.text ="设置提示语"
+        view_title_layout_tv_no.text = getString(R.string.set_hint)
 
         //网络图标
         if ( Constant.network_state == 1){

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

@@ -63,9 +63,11 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingdoorSettingM
             NetworkDialogHelper.showDialog(activity)
         }
 
-        //通话设置
+        //设备配置
         settings_main_top_3_ll.setOnClickListener {
-            CallConfigDialogHelper.showDialog(activity)
+            val intent = Intent()
+            intent.setClass(activity, DeviceSystemActivity::class.java)
+            activity.startActivity(intent)
         }
 
         //进入调试
@@ -120,14 +122,14 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingdoorSettingM
 
     fun setfuq(){
         settings_main_10_tx.text= CommonUtils.getUrl(this)
-        showMessage("请重启设备，重新激活设备")
+        showMessage(R.string.reboot_register)
     }
 
     private fun showui(){
         view_title_layout_tv_hospital_name.setText(R.string.str_back)
         view_title_layout_img.visibility = View.VISIBLE
         view_title_layout_tv_no.visibility =View.VISIBLE
-        view_title_layout_tv_no.text ="设备信息"
+        view_title_layout_tv_no.text =getString(R.string.str_device_info)
         val orientation = resources.configuration.orientation
         if (orientation == Configuration.ORIENTATION_PORTRAIT) {
             // 竖屏模式
@@ -185,9 +187,9 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingdoorSettingM
         settings_main_11_tx.text= Constant.SIP_ID
         //语音类型 ？？
         if(SettingConfig.getSipEnabled(activity)){
-            settings_main_12_tx.text= "sip"+"类型"
+            settings_main_12_tx.text= "sip"
         }else{
-            settings_main_12_tx.text= "webrtc"+"类型"
+            settings_main_12_tx.text= "webrtc"
         }
         //语音服务器
         settings_main_13_tx.text= "${Constant.SIP_ID}@${Constant.sip_ip}:${Constant.sip_port}"

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

@@ -54,7 +54,7 @@ class TextActivity : BaseActivity<TextActivityPresenter, CallingdoorTestMainBind
             core = WdklSipService.getCore()
         }
         if (core?.identity.equals("") || core?.identity==null ){
-            password_ed.hint = "无法获取本设备sip号"
+            password_ed.hint = "No sipId"
         }else{
             password_ed.hint = core?.identity
         }
@@ -78,7 +78,7 @@ class TextActivity : BaseActivity<TextActivityPresenter, CallingdoorTestMainBind
                     core?.inviteAddressWithParams(addressToCall, params!!)
                 }
             }else{
-                showMessage("未启动sip服务,请启动服务后，在进行sip通话")
+                showMessage(R.string.sip_service_not_running)
             }
         }
 
@@ -107,14 +107,14 @@ class TextActivity : BaseActivity<TextActivityPresenter, CallingdoorTestMainBind
 
     fun setfuq(){
         settings_main_10_tx.text= CommonUtils.getUrl(this)
-        showMessage("请重启设备，重新激活设备")
+        showMessage(R.string.reboot_register)
     }
 
     private fun showui(){
         view_title_layout_tv_hospital_name.setText(R.string.str_back)
         view_title_layout_img.visibility = View.VISIBLE
         view_title_layout_tv_no.visibility =View.VISIBLE
-        view_title_layout_tv_no.text ="设备调试"
+        view_title_layout_tv_no.setText(R.string.device_test)
         //网络图标
         if ( Constant.network_state == 1){
             view_title_layout_iv_wifi.visibility = View.VISIBLE
@@ -175,7 +175,7 @@ class TextActivity : BaseActivity<TextActivityPresenter, CallingdoorTestMainBind
                 mCamera = Camera.open()
             } catch (e: Exception) {
                 tv_camera.visibility = View.VISIBLE
-                tv_camera.text = "摄像头打开失败"
+                tv_camera.setText(R.string.str_open_camera_failed)
                 e.printStackTrace()
                 return
             }
@@ -214,7 +214,7 @@ class TextActivity : BaseActivity<TextActivityPresenter, CallingdoorTestMainBind
             })
         } else {
             tv_camera.visibility = View.VISIBLE
-            tv_camera.text = "没有摄像头"
+            tv_camera.setText(R.string.str_no_camera)
         }
     }
 
@@ -243,16 +243,17 @@ class TextActivity : BaseActivity<TextActivityPresenter, CallingdoorTestMainBind
                     mbhj_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
                     mbh_img.visibility=View.VISIBLE
                 }else if(message == "bo"){
-                    //手柄取消
+                    //播放中
                     lycs_button.setCompoundDrawablesWithIntrinsicBounds(R.mipmap.bo, 0, 0, 0)
-                    lycs_button.text="播放中"
+                    lycs_button.setText(R.string.str_record_playing)
                 }else if(message == "bo_w"){
-                    //手柄取消
+                    //播放完毕
                     lycs_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
-                    lycs_button.text="播放完毕"
+                    lycs_button.setText(R.string.str_record_play_complete)
                     lycs_img.visibility=View.VISIBLE
                 }else if(message == "lu"){
-                    lycs_button.text="录音中"
+                    //录音中
+                    lycs_button.setText(R.string.str_recording)
 
                 }
         }else if (Constant.EVENT_FINISHh == messageEvent.type) {

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/adapter/NewFrameRoomAdapter.kt

@@ -15,10 +15,14 @@ import androidx.recyclerview.widget.RecyclerView
 import com.libra.Color
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.util.HorizantalAutoBrLayout
+import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
 import com.wdkl.ncs.android.middleware.model.vo.FrameBedVO
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import com.wdkl.ncs.android.middleware.utils.StringUtil
+import kotlinx.android.synthetic.main.main_view_layout.*
+import java.util.*
+import kotlin.collections.ArrayList
 
 class NewFrameRoomAdapter : RecyclerView.Adapter<NewFrameRoomAdapter.BedViewHolder> {
 
@@ -80,24 +84,45 @@ class NewFrameRoomAdapter : RecyclerView.Adapter<NewFrameRoomAdapter.BedViewHold
         if (TextUtils.isEmpty(bedVO.customerName)) {
             //空床位
             holder.tv_bed_name_title.text = CommonUtils.subStringAfter2(bedVO.frameBed.fullName, "-")
-            holder.bedName.text = "空床位"
-            holder.tv_bed_sex.text = "性别:无"
-            holder.tv_bed_age.text = "年龄:无"
-            holder.bed_medic_name.text = "无"
-            holder.bed_nurse_name.text = "无"
+            holder.bedName.text = StringUtil.getResString(R.string.empty_bed)
+            holder.tv_bed_sex.text =StringUtil.getResString(R.string.str_gender_none)+StringUtil.getResString(R.string.empty)
+            holder.tv_bed_age.text = StringUtil.getResString(R.string.str_age)+StringUtil.getResString(R.string.empty)
+            holder.bed_medic_name.text = StringUtil.getResString(R.string.empty)
+            holder.bed_nurse_name.text = StringUtil.getResString(R.string.empty)
         } else {
             holder.tv_bed_name_title.text = CommonUtils.subStringAfter2(bedVO.frameBed.fullName, "-")
             holder.bedName.text = bedVO.customerName
-            holder.tv_bed_age.text = "年龄:"+ bedVO.customerAge + bedVO.customerAgeUnit
+            holder.tv_bed_age.text =StringUtil.getResString(R.string.str_age)+ bedVO.customerAge + bedVO.customerAgeUnit
             if (bedVO.customerSex == 0) {
-                holder.tv_bed_sex.text = "性别:女"
+                holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_female)
             } else if (bedVO.customerSex == 1) {
-                holder.tv_bed_sex.text = "性别:男"
+                holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_male)
             } else {
-                holder.tv_bed_sex.text = "性别:无"
+                holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_none)+StringUtil.getResString(R.string.empty)
             }
             holder.bed_medic_name.text = bedVO.doctorName
             holder.bed_nurse_name.text = bedVO.nurseName
+            holder.bed_medic_info.text = Constant.doctorTitle
+            holder.bed_nurse_info.text = Constant.nurseTitle
+
+            val currentLanguage: String = Locale.getDefault().getLanguage()
+            if (currentLanguage.equals("es") ){
+                //西班牙语
+                holder.tv_bed_sex.setTextSize(15f)
+                holder.tv_bed_age.setTextSize(15f)
+                holder.tv_bed_card_no.setTextSize(10f)
+            }else if (currentLanguage.equals("en")){
+                //英语
+                holder.tv_bed_sex.setTextSize(17f)
+                holder.tv_bed_age.setTextSize(17f)
+                holder.tv_bed_card_no.setTextSize(12f)
+            }else if (currentLanguage.equals("ru")){
+                //俄语
+                holder.tv_bed_sex.setTextSize(15f)
+                holder.tv_bed_age.setTextSize(15f)
+                holder.tv_bed_card_no.setTextSize(12f)
+            }
+
 
 //
 //            holder.ll_one.removeAllViews()
@@ -128,6 +153,7 @@ class NewFrameRoomAdapter : RecyclerView.Adapter<NewFrameRoomAdapter.BedViewHold
     class BedViewHolder: RecyclerView.ViewHolder {
         var bedName : TextView
         var tv_bed_name_title : TextView
+        var tv_bed_card_no : TextView
         var tv_bed_age : TextView
         var tv_bed_sex : TextView
         var bed_medic_name : TextView
@@ -139,6 +165,7 @@ class NewFrameRoomAdapter : RecyclerView.Adapter<NewFrameRoomAdapter.BedViewHold
 
         constructor(itemView: View): super(itemView) {
             bedName = itemView.findViewById(R.id.tv_bed_name)
+            tv_bed_card_no = itemView.findViewById(R.id.tv_bed_card_no)
             tv_bed_name_title = itemView.findViewById(R.id.tv_bed_name_title)
             tv_bed_age = itemView.findViewById(R.id.tv_bed_age)
             tv_bed_sex = itemView.findViewById(R.id.tv_bed_sex)

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/di/CallingdoorComponent.kt

@@ -27,8 +27,6 @@ interface CallingdoorComponent {
 
     fun inject(fragment: YhFragment)
 
-    fun inject(fragment: MoreFragment)
-
     fun inject(fragment: NurseFragment)
 
     fun inject(fragment: MomFragment)
@@ -41,4 +39,7 @@ interface CallingdoorComponent {
 
     fun inject(activity: HospitalInfoActivity)
 
+
+    fun inject(activity: DeviceSystemActivity)
+
 }

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/HuliDialogHelper.java

@@ -33,13 +33,13 @@ public class HuliDialogHelper {
         TextView hili_text = contentView.findViewById(R.id.hili_text);
         Button huli_confirm_button = contentView.findViewById(R.id.huli_confirm_button);
         if (!isconfirm){
-            hili_text.setText("以上病床护理中，确认退出？");
-            huli_confirm_button.setText("退出护理");
+            hili_text.setText(R.string.bed_in_nursing);
+            huli_confirm_button.setText(R.string.exit_nursing);
         }else {
-            hili_text.setText("对该病房床位设置为护理状态");
-            huli_confirm_button.setText("进入护理");
+            hili_text.setText(R.string.bed_set_nursing);
+            huli_confirm_button.setText(R.string.enter_nursing);
         }
-        hili_top_text.setText("102床、103床、104床、105床");
+//        hili_top_text.setText("102床、103床、104床、105床");
         huli_confirm_button.setOnClickListener(v -> {
             if (alertDialog != null && alertDialog.isShowing()) {
                 alertDialog.dismiss();

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/Network2DialogHelper.java

@@ -67,14 +67,14 @@ public class Network2DialogHelper {
                 String wg = network2_wg.getText().toString();
                 String dns = network2_dns.getText().toString();
                 if (IP.isEmpty()&&ym.isEmpty()&&wg.isEmpty()&&dns.isEmpty()){
-                    showMessage("参数错误请重新输入");
+                    showMessage(R.string.param_set_error);
                 }
                 alertDialog.dismiss();
                 //设置静态网络
                 if (EthernetUtils.setEthernetStaticIp(activity,IP,ym,wg,dns)) {
-                    showMessage("静态获取网络设置成功");
+                    showMessage("Success");
                 } else {
-                    showMessage("静态获取网络设置失败");
+                    showMessage("Failed");
                 }
             }
         });

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/NetworkDialogHelper.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.provider.Settings;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -35,13 +36,28 @@ public class NetworkDialogHelper {
         TextView network_one_tx = contentView.findViewById(R.id.network_one_tx);
         TextView network_two_tx = contentView.findViewById(R.id.network_two_tx);
         Button network_button = contentView.findViewById(R.id.network_button);
+
+        int type = EthernetUtils.getEthUseDhcpOrStaticIp(activity);
+        Log.d("network", "get net type: " + type);
+        if (type == 1) {
+            //静态
+            network="STATIC";
+            network_two_tx.setBackgroundResource(R.drawable.shape_main_hos_txt_bg);
+            network_one_tx.setBackgroundResource(R.drawable.selector_nuser_msg_tx_d);
+        } else if (type == 2) {
+            //动态
+            network="DHCP";
+            network_one_tx.setBackgroundResource(R.drawable.shape_main_hos_txt_bg);
+            network_two_tx.setBackgroundResource(R.drawable.selector_nuser_msg_tx_d);
+        }
+
         network_one_tx.setOnClickListener(v -> {
             network="DHCP";
             network_one_tx.setBackgroundResource(R.drawable.shape_main_hos_txt_bg);
             network_two_tx.setBackgroundResource(R.drawable.selector_nuser_msg_tx_d);
         });
         network_two_tx.setOnClickListener(v -> {
-            network="静态";
+            network="STATIC";
             network_one_tx.setBackgroundResource(R.drawable.selector_nuser_msg_tx_d);
             network_two_tx.setBackgroundResource(R.drawable.shape_main_hos_txt_bg);
         });
@@ -52,14 +68,14 @@ public class NetworkDialogHelper {
 //                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 //                activity.startActivity(intent);
 
-                if (network.equals("静态")){
+                if (network.equals("STATIC")){
                     Network2DialogHelper.showDialog(activity);
                 }else {
                     //设置成动态获取网络
                     if (EthernetUtils.setDynamicIp(activity)) {
-                        showMessage("动态获取网络设置成功");
+                        showMessage("Success");
                     } else {
-                        showMessage("动态获取网络设置失败");
+                        showMessage("Failed");
                     }
                 }
 

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/PatrolDialogHelper.java

@@ -15,6 +15,7 @@ import android.widget.TextView;
 import com.wdkl.app.ncs.callingdoor.BuildConfig;
 import com.wdkl.app.ncs.callingdoor.R;
 import com.wdkl.ncs.android.middleware.common.Constant;
+import com.wdkl.ncs.android.middleware.utils.StringUtil;
 
 /**
  * 医护巡房
@@ -32,6 +33,7 @@ public class PatrolDialogHelper {
         TextView patrol_tip_text = contentView.findViewById(R.id.patrol_tip_text);
         Button patrol_confirm_button = contentView.findViewById(R.id.patrol_confirm_button);
 
+        patrol_tip_text.setText(StringUtil.getResString(R.string.str_patrol)+Constant.BED_NAME);
         patrol_confirm_button.setOnClickListener(v -> {
             if (alertDialog != null && alertDialog.isShowing()) {
                 alertDialog.dismiss();

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/PositioningDialogHelper.java

@@ -16,6 +16,7 @@ import com.wdkl.app.ncs.callingdoor.BuildConfig;
 import com.wdkl.app.ncs.callingdoor.R;
 import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper;
 import com.wdkl.ncs.android.middleware.common.Constant;
+import com.wdkl.ncs.android.middleware.utils.StringUtil;
 
 /**
  * 医护定位
@@ -32,7 +33,7 @@ public class PositioningDialogHelper {
 
         TextView positioning_tip_text = contentView.findViewById(R.id.positioning_tip_text);
         Button positioning_confirm_button = contentView.findViewById(R.id.positioning_confirm_button);
-
+        positioning_tip_text.setText(StringUtil.getResString(R.string.str_positioned)+Constant.BED_NAME);
         positioning_confirm_button.setOnClickListener(v -> {
             if (alertDialog != null && alertDialog.isShowing()) {
                 alertDialog.dismiss();

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/ReinforcementsDialogHelper.java

@@ -55,11 +55,11 @@ public class ReinforcementsDialogHelper {
         Button reinforcements_confirm_button = contentView.findViewById(R.id.reinforcements_confirm_button);
         if (type){
             reinforcements_img.setBackgroundResource(R.mipmap.fachu);
-            reinforcements_tip_text.setText("增援已发出，请耐心等待回应");
+            reinforcements_tip_text.setText(R.string.reinforce_sent);
             reinforcements_confirm_button.setBackgroundResource(R.drawable.shape_main_hos_txt_bg);
         }else {
             reinforcements_img.setBackgroundResource(R.mipmap.xiangy);
-            reinforcements_tip_text.setText("您的增援已响应，护士正在赶来的路上");
+            reinforcements_tip_text.setText(R.string.reinforce_respond);
             reinforcements_confirm_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg);
         }
         reinforcements_confirm_button.setOnClickListener(v -> {

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/ServicesDialogHelper.java

@@ -45,7 +45,7 @@ public class ServicesDialogHelper {
         server_determine_button.setOnClickListener(v -> {
             if (alertDialog != null && alertDialog.isShowing()) {
                 if(server_ed.getText().toString().equals("")){
-                    showMessage("服务器地址不能为空");
+                    showMessage(R.string.str_server_ip_empty);
                     return;
                 }
                 CommonUtils.setUrl(BaseApplication.appContext, server_ed.getText().toString());

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/SystemDialogHelper.java

@@ -2,8 +2,10 @@ package com.wdkl.app.ncs.callingdoor.dialog;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.zhyl.ZhylManager;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.provider.Settings;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -18,6 +20,7 @@ import com.wdkl.app.ncs.callingdoor.BuildConfig;
 import com.wdkl.app.ncs.callingdoor.R;
 import com.wdkl.app.ncs.callingdoor.activity.AppUpdateActivity;
 import com.wdkl.app.ncs.callingdoor.activity.SystemActivity;
+import com.wdkl.app.ncs.callingdoor.hardware.HardWareFactroy;
 import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper;
 import com.wdkl.app.ncs.callingdoor.helper.Utils;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
@@ -25,12 +28,15 @@ import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.utils.CommonUtils;
 
 import static com.wdkl.ncs.android.lib.utils.ExtendMethodsKt.push;
+import static com.wdkl.ncs.android.lib.utils.ExtendMethodsKt.showMessage;
 
 public class SystemDialogHelper {
 
     private static AlertDialog alertDialog;
 
-    public static void showDialog(Activity activity) {
+
+
+    public static void showDialog(Activity activity,int type) {
 
         View contentView = LayoutInflater.from(activity).inflate(R.layout.main_password_dialog, null);
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
@@ -61,9 +67,31 @@ public class SystemDialogHelper {
             if (alertDialog != null && alertDialog.isShowing()) {
                 String passwprd =password_ed.getText().toString();
                 if (passwprd.equals("888")){
-                    Intent intent = new Intent();
-                    intent.setClass(activity, SystemActivity.class);
-                    activity.startActivity(intent);
+                    if (type==1){
+                        Intent intent = new Intent();
+                        intent.setClass(activity, SystemActivity.class);
+                        activity.startActivity(intent);
+                    }else if (type==2){
+                        //打开底部导航栏
+                        HardWareFactroy.getHardTools().startbar(true);
+
+                        if (BuildConfig.flag.equals(Constant.DEV_W_A133)) {
+                            //关闭守护进程
+                            ZhylManager.getInstance(BaseApplication.appContext).sys_setDaemonsActivity("",10000,false);
+                        }
+
+
+                        Intent intent = new Intent(Settings.ACTION_SETTINGS);
+                        activity.startActivity(intent);
+
+                    }else {
+                        Intent intent = new Intent();
+                        intent.setClass(activity, SystemActivity.class);
+                        activity.startActivity(intent);
+                    }
+
+                } else {
+                    showMessage(R.string.invalid_password);
                 }
                 alertDialog.dismiss();
             }
@@ -89,16 +117,5 @@ public class SystemDialogHelper {
                 e.printStackTrace();
             }
         }
-//        //设置dialog宽高及位置
-//        try {
-//            Window window = alertDialog.getWindow();
-//            WindowManager.LayoutParams lp = window.getAttributes();
-//            lp.width = 680;
-//            lp.height = 440;
-//            lp.gravity = Gravity.CENTER;
-//            window.setAttributes(lp);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
     }
 }

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

@@ -31,6 +31,8 @@ import kotlinx.android.synthetic.main.main_view_layout.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import java.util.*
+import kotlin.collections.ArrayList
 
 class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>(), MainFragmentContract.View {
     val TAG = "MainFragment"
@@ -49,6 +51,8 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
     }
 
     override fun init() {
+        //语言适配
+        Languageui()
         val orientation = resources.configuration.orientation
         if (orientation == Configuration.ORIENTATION_PORTRAIT) {
             // 竖屏模式
@@ -62,7 +66,24 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
         rv_bed_view.adapter = roomAdpter
         updateInfo()
     }
+    private fun Languageui(){
+
+       val currentLanguage: String = Locale.getDefault().getLanguage()
+        if (currentLanguage.equals("es") ){
+            //西班牙语
+            f_tx_people.setTextSize(20f)
+            f_tx_bed.setTextSize(20f)
+        }else if (currentLanguage.equals("en")){
+            //英语
+//            f_tx_people.setTextSize(22f)
+//            f_tx_bed.setTextSize(22f)
+        }else if (currentLanguage.equals("ru")){
+            //俄语
+            f_tx_people.setTextSize(20f)
+            f_tx_bed.setTextSize(20f)
+        }
 
+    }
     override fun bindEvent() {
     }
 

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/MomFragment.kt

@@ -69,7 +69,7 @@ class  MomFragment : BaseFragment<MainFragmentPresenter, CallingBabymomMainBindi
     override fun bindEvent() {
         //进入系统设置
         mom_view_title_layout_return.setOnClickListener {
-            SystemDialogHelper.showDialog(activity)
+            SystemDialogHelper.showDialog(activity,1)
         }
 
     }
@@ -125,8 +125,8 @@ class  MomFragment : BaseFragment<MainFragmentPresenter, CallingBabymomMainBindi
 
                 babymom_mian_name.text = bedList.get(0).customerName
                 babymom_mian_age.text = bedList.get(0).customerAge.toString()+bedList.get(0).customerAgeUnit
-                babymom_mian_time_out.text = "入住日期："+TimeHandle.getDateTime( bedList.get(0).customerInDate  * 1000L, "yyyy年MM月dd日")
-                babymom_mian_time_end.text = "离宫日期："+  TimeHandle.getDateTime( bedList.get(0).customerOutDate  * 1000L, "yyyy年MM月dd日")
+                babymom_mian_time_out.text =getString(R.string.door_mom_main_1)+TimeHandle.getDateTime( bedList.get(0).customerInDate  * 1000L, "yyyy年MM月dd日")
+                babymom_mian_time_end.text = getString(R.string.door_mom_main_2)+  TimeHandle.getDateTime( bedList.get(0).customerOutDate  * 1000L, "yyyy年MM月dd日")
 
                 if (bedList[0].frameBedRelativeVos!=null){
                     babyList.addAll( bedList[0].frameBedRelativeVos)

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/MoreFragment.kt

@@ -1,70 +0,0 @@
-package com.wdkl.app.ncs.callingdoor.fragment
-
-import com.enation.javashop.net.engine.model.NetState
-import com.wdkl.app.ncs.callingdoor.R
-import com.wdkl.app.ncs.callingdoor.databinding.CallingdoorNurseBinding
-import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
-import com.wdkl.ncs.android.lib.base.BaseFragment
-import com.wdkl.ncs.android.lib.utils.showMessage
-import com.wdkl.ncs.android.lib.vo.filter
-import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.MoreFragmentContract
-import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.YhFragmentContract
-import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.MoreFragmentPresenter
-import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.YhFragmentPresenter
-
-/**
- * 更多界面
- */
-class MoreFragment : BaseFragment<MoreFragmentPresenter, CallingdoorNurseBinding>(), MoreFragmentContract.View {
-
-    val TAG = "YhFragment"
-
-
-    override fun getLayId(): Int {
-        return R.layout.callingdoor_nurse
-    }
-    override fun bindDagger() {
-        CallingdoorLaunch.component.inject(this)
-    }
-    //数据绑定
-    override fun init() {
-
-    }
-    //点击事件
-    override fun bindEvent() {
-
-    }
-    /**执行其他销毁操作*/
-    override fun destory() {
-
-    }
-
-    override fun setUrlString(url: String) {
-
-    }
-
-    override fun onError(message: String, type: Int) {
-        showMessage(message)
-    }
-
-    override fun complete(message: String, type: Int) {
-
-    }
-
-    override fun start() {
-
-    }
-
-
-    override fun networkMonitor(state: NetState) {
-        state.filter(onWifi = {
-
-        },onMobile = {
-
-        },offline = {
-
-        })
-    }
-
-
-}

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/NurseFragment.kt

@@ -22,9 +22,11 @@ import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.NurseFragmentC
 import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.NurseFragmentPresenter
 import com.wdkl.ncs.android.middleware.tcp.channel.YhUtil
 import kotlinx.android.synthetic.main.callingdoor_nurse_main.*
+import kotlinx.android.synthetic.main.main_view_layout.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import java.util.*
 
 
 /**
@@ -35,7 +37,7 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
 
     val TAG = "YhFragment"
     var isconfirm = true
-
+    var id = ""
     var passno = ""
     var yh_name = ""
 
@@ -48,9 +50,9 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
     //数据绑定
     override fun init() {
         passno = SPUtils.get(getActivity(), Constant.YH_NO, "") as String
-
+        id = SPUtils.get(getActivity(), Constant.YH_ID, "") as String
         yh_name = SPUtils.get(getActivity(), Constant.YH_NAME, "")as String
-
+        Languageui()
         showui()
 
     }
@@ -58,7 +60,7 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
     override fun bindEvent() {
            //退出医护
         nurse_main_bt.setOnClickListener {
-            YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, passno)
+            YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, id.toInt())
             (activity as CallingdoorActivity).BackMain()
         }
         //定位
@@ -66,11 +68,11 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
             PositioningDialogHelper.showDialog(activity, object : PositioningDialogHelper.ClickListener {
                 override fun onClick() {
                     YhUtil.sendPositioning(Constant.DEVICE_ID, passno)
-                    SpeechUtil.getInstance().speak(yh_name+"定位"+Constant.BED_NAME)
+                    SpeechUtil.getInstance().speak(yh_name+getString(R.string.str_position)+Constant.BED_NAME)
                     nurse_main_1_ll.setBackgroundResource(R.drawable.shape_positioning_dialog_bt_bg)
                     nurse_main_1_img.setImageResource(R.mipmap.ding_y)
                     nurse_top_1_tx.setTextColor(resources.getColor(R.color.white))
-                    nurse_top_1_tx.text="已定位"
+                    nurse_top_1_tx.setText(R.string.str_positioned)
                     nurse_main_1_tx.setTextColor(resources.getColor(R.color.white))
                 }
             })
@@ -80,11 +82,11 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
             PatrolDialogHelper.showDialog(activity, object : PatrolDialogHelper.ClickListener {
                 override fun onClick() {
                     YhUtil.sendRoomCheck(Constant.DEVICE_ID, passno)
-                    SpeechUtil.getInstance().speak(yh_name+Constant.BED_NAME+"已巡房")
+                    SpeechUtil.getInstance().speak(yh_name+Constant.BED_NAME+getString(R.string.str_patroled))
                     nurse_main_2_ll.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
                     nurse_main_2_img.setImageResource(R.mipmap.xun_y)
                     nurse_top_2_tx.setTextColor(resources.getColor(R.color.white))
-                    nurse_top_2_tx.text="已巡房"
+                    nurse_top_2_tx.text=getString(R.string.str_patroled)
                     nurse_main_2_tx.setTextColor(resources.getColor(R.color.white))
                 }
             })
@@ -98,15 +100,15 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
                         nurse_main_3_ll.setBackgroundResource(R.drawable.shape_huli_dialog_bt_bg)
                         nurse_main_3_img.setImageResource(R.mipmap.hu_y)
                         nurse_top_3_tx.setTextColor(resources.getColor(R.color.white))
-                        nurse_top_3_tx.text="护理中"
+                        nurse_top_3_tx.text=getString(R.string.nursing_title)
                         nurse_main_3_tx.setTextColor(resources.getColor(R.color.white))
                         (activity as CallingdoorActivity).setHuli()
-                        YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, passno)
+                        YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, id.toInt())
                     }else{
                         nurse_main_3_ll.setBackgroundResource(R.drawable.shape_bed_bg)
                         nurse_main_3_img.setImageResource(R.mipmap.hu)
                         nurse_top_3_tx.setTextColor(resources.getColor(R.color.black))
-                        nurse_top_3_tx.text="进入护理"
+                        nurse_top_3_tx.text=getString(R.string.enter_nursing)
                         nurse_main_3_tx.setTextColor(resources.getColor(R.color.text_name_color))
                     }
 
@@ -128,7 +130,7 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
         nurse_main_1_ll.setBackgroundResource(R.drawable.shape_bed_bg)
         nurse_main_1_img.setBackgroundResource(R.mipmap.ding)
         nurse_top_1_tx.setTextColor(resources.getColor(R.color.black))
-        nurse_top_1_tx.text="定位"
+        nurse_top_1_tx.text=getString(R.string.str_position)
         nurse_main_2_ll.setBackgroundResource(R.drawable.shape_bed_bg)
         nurse_main_2_img.setBackgroundResource(R.mipmap.xun)
         nurse_top_2_tx.setTextColor(resources.getColor(R.color.black))
@@ -137,7 +139,24 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
         nurse_top_3_tx.setTextColor(resources.getColor(R.color.black))
         nurse_main_1_tx.text=Constant.BED_NAME
         nurse_main_2_tx.text=Constant.BED_NAME
-        nurse_main_3_tx.text=Constant.BED_NAME+"进入护理"
+        nurse_main_3_tx.text=Constant.BED_NAME+getString(R.string.enter_nursing)
+    }
+
+
+
+    private fun Languageui(){
+
+        val currentLanguage: String = Locale.getDefault().getLanguage()
+        if (currentLanguage.equals("es") ){
+            //西班牙语
+            nurse_main_4_tx.setTextSize(16f)
+        }else if (currentLanguage.equals("en")){
+            //英语
+        }else if (currentLanguage.equals("ru")){
+            //俄语
+            nurse_main_4_tx.setTextSize(16f)
+        }
+
     }
     /**执行其他销毁操作*/
     override fun destory() {
@@ -191,7 +210,7 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
             Constant.EVENT_EXIT_YH ->{
                 ExitHuliDialogHelper.showDialog(activity,object : ExitHuliDialogHelper.ClickListener {
                     override fun onClick() {
-                        YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, passno)
+                        YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, id.toInt())
                         (activity as CallingdoorActivity).BackMain()
                     }
                 })

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

@@ -116,7 +116,7 @@ class NursingWorkFragment : BaseFragment<NursingWorkFragmentPresenter, NursingWo
     private fun showDefaultDeviceMenu() {
         //添加默认设备菜单
         val deviceMenu = DeviceMenulist()
-        deviceMenu.name = "设备信息"
+        deviceMenu.name = getString(R.string.str_device_info)
         deviceMenu.type = "ACT"
         deviceMenu.act_name = "SystemActivity"
         deviceMenu.actived = 1
@@ -196,23 +196,23 @@ class NursingWorkFragment : BaseFragment<NursingWorkFragmentPresenter, NursingWo
                     intent.setClass(activity, SystemActivity::class.java)
                     activity.startActivity(intent)*/
 
-                    SystemDialogHelper.showDialog(activity)
+                    SystemDialogHelper.showDialog(activity,1)
                 }else if (allOrders.get(keyId).act_name.equals("YhFragment")){
                     //医护
 //                    (activity as CallingdoorActivity).addYhFragment()
-                    showMessage("暂未开通")
+                    showMessage(R.string.str_not_support)
                 }else if (allOrders.get(keyId).act_name.equals("signFragment")){
                     //体征
 //                    val intent = Intent()
 //                    intent.setClass(activity, SignActivity::class.java)
 //                    activity.startActivity(intent)
-                    showMessage("暂未开通")
+                    showMessage(R.string.str_not_support)
                 }else if (allOrders.get(keyId).act_name.equals("costActivity")){
                     //费用
 //                    val intent = Intent()
 //                    intent.setClass(activity, CostActivity::class.java)
 //                    activity.startActivity(intent)
-                    showMessage("暂未开通")
+                    showMessage(R.string.str_not_support)
                 }else if (allOrders.get(keyId).act_name.equals("huli")){
                     //护理状态
                     (activity as CallingdoorActivity).setHuli()
@@ -232,19 +232,19 @@ class NursingWorkFragment : BaseFragment<NursingWorkFragmentPresenter, NursingWo
 //                    val intent = Intent()
 //                    intent.setClass(activity, DepartmentInfoActivity::class.java)
 //                    activity.startActivity(intent)
-                    showMessage("暂未开通")
+                    showMessage(R.string.str_not_support)
                 }else if (allOrders.get(keyId).act_name.equals("DoctorsAdviceActivity")){
                     //医嘱
 //                    val intent = Intent()
 //                    intent.setClass(activity, DoctorsAdviceActivity::class.java)
 //                    activity.startActivity(intent)
-                    showMessage("暂未开通")
+                    showMessage(R.string.str_not_support)
                 }else if (allOrders.get(keyId).act_name.equals("detectionActivity")){
                     //检测检测
                     //                    val intent = Intent()
 //                    intent.setClass(activity, DepartmentInfoActivity::class.java)
 //                    activity.startActivity(intent)
-                    showMessage("暂未开通")
+                    showMessage(R.string.str_not_support)
                 }
             }else if (allOrders.get(keyId).type.equals("SYS")){
                 var menu_id =allOrders.get(keyId).id
@@ -262,10 +262,10 @@ class NursingWorkFragment : BaseFragment<NursingWorkFragmentPresenter, NursingWo
                     activity.startActivity(intent)
                 }
             } else {
-                showMessage("类型错误")
+                showMessage(R.string.str_type_error)
             }
         } catch (e: Exception) {
-           showMessage("结果异常，请在后台设置")
+            showMessage(R.string.str_result_error)
             e.printStackTrace()
         }
     }

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

@@ -84,11 +84,10 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingdoorNurseBinding>()
         nurse_bt_1.setOnClickListener {
             if (!passno.equals("")){
                 YhUtil.sendLanding(Constant.DEVICE_ID, passno)
-                (activity as CallingdoorActivity).startYhMode()
                 SPUtils.put(getActivity(), Constant.YH_NO, passno);
                 SPUtils.put(getActivity(), Constant.YH_NAME, yh_name);
             }else{
-                showMessage("卡号不能为空，请重新选择")
+                showMessage("no part id")
             }
 
         }

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/HardTools.java

@@ -39,6 +39,8 @@ public  class HardTools {
     //安装方式2
     public void startInstallApk(AppUpdateActivity context ){}
 
+    public void startbar(Boolean is){}
+
     public void CallConfigg(int mic,int yl){}
     //提供卡号
     public  void offerCardData(String data){}

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/imp/Wa133HardTools.java

@@ -57,6 +57,12 @@ public class Wa133HardTools extends HardTools {
         SerialPortUtil.getInstance().closeSerialPort();
 
     }
+
+    @Override
+    public void startbar(Boolean is) {
+        ZhylManager.getInstance(BaseApplication.appContext).disp_setNavigationBar(is);
+        super.startbar(is);
+    }
     @Override
     public void setSOSStart() {
         SOSHelper.sosStart();

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

@@ -77,6 +77,60 @@ public class SettingConfig {
     //喇叭增益
     private static final String KEY_SP_HORN_ENABLE = "KEY_SP_HORN_ENABLE";
 
+
+    //是否开启蓝牙网关
+    private static final String KEY_SP_BLUETOOTH_GATEWAY = "KEY_SP_BLUETOOTH_GATEWAY";
+
+    //是否开启433串口
+    private static final String KEY_SP_433_GATEWAY = "KEY_SP_433_GATEWAY";
+
+    //是否开启床垫服务
+    private static final String KEY_SP_SLEEP_GATEWAY = "KEY_SP_SLEEP_GATEWAY";
+
+    //是否设备场景类型 //医院 月子中心 养老 公寓
+    private static final String KEY_SP_Scene_type= "KEY_SP_Scene_type";
+
+    //是否设备apk类型
+    private static final String KEY_SP_APK_TYPE= "KEY_SP_APK_TYPE";
+
+    //屏幕方向
+    private static final String KEY_SP_window= "KEY_SP_window";
+
+    //是否开启声网自动接听
+    private static final String KEY_SP_SW_CALL = "KEY_SP_SW_CALL";
+
+    public static void setSwCall(Context context, boolean on) {
+        getEditor(context).putBoolean(KEY_SP_SW_CALL, on).apply();
+    }
+
+    public static boolean getSwCall(Context context) {
+        return getSP(context).getBoolean(KEY_SP_SW_CALL, true);
+    }
+
+    public static void setScene(Context context, int mode) {
+        getEditor(context).putInt(KEY_SP_Scene_type, mode).apply();
+    }
+
+    public static int getScene(Context context) {
+        return getSP(context).getInt(KEY_SP_Scene_type, 0);
+    }
+
+    public static void setAPK(Context context, int mode) {
+        getEditor(context).putInt(KEY_SP_APK_TYPE, mode).apply();
+    }
+
+    public static int getAPK(Context context) {
+        return getSP(context).getInt(KEY_SP_APK_TYPE, 0);
+    }
+
+    public static void setwindow(Context context, int mode) {
+        getEditor(context).putInt(KEY_SP_window, mode).apply();
+    }
+
+    public static int getwindow(Context context) {
+        return getSP(context).getInt(KEY_SP_window, 0);
+    }
+
     public static void setMIC(Context context, int mode) {
         getEditor(context).putInt(KEY_SP_MIC_ENABLE, mode).apply();
     }

callingdoor/src/main/res/layout-land/callingbed_device_sys.xml

@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="#F7F7F7">
+
+        <include
+            android:id="@+id/activity_calling_door_layout_title"
+            layout="@layout/view_title_layout" />
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+
+            <LinearLayout
+                android:id="@+id/ll_device_config_view"
+                android:layout_width="@dimen/d450"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d24"
+                android:layout_marginRight="@dimen/d24"
+                android:layout_marginTop="@dimen/d30"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/nurse_msg_tx_1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="*"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/txt_number"
+                        android:textStyle="bold"
+                        android:layout_marginTop="@dimen/d18"
+                        android:layout_marginLeft="@dimen/d28"
+                        />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:text="@string/str_device_selection_type"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+
+                <Spinner
+                    android:id="@+id/device_sys_ed_1"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d52"
+                    android:layout_marginRight="@dimen/d40"
+                    android:layout_marginLeft="@dimen/d40"
+                    android:layout_marginTop="@dimen/d40"
+                    android:layout_marginBottom="@dimen/d40"
+                    android:background="@drawable/shape_device_sys_ed_bg"
+                    android:gravity="center_vertical"
+                    android:entries="@array/device_list"
+
+                    />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_device_config_view_2"
+                android:layout_below="@+id/ll_device_config_view"
+                android:layout_width="@dimen/d450"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d24"
+                android:layout_marginRight="@dimen/d24"
+                android:layout_marginTop="@dimen/d30"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="*"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/txt_number"
+                        android:textStyle="bold"
+                        android:layout_marginTop="@dimen/d18"
+                        android:layout_marginLeft="@dimen/d28"
+                        />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:text="@string/str_device_selection_language"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+                <Spinner
+                    android:id="@+id/device_sys_ed_2"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d52"
+                    android:layout_marginRight="@dimen/d40"
+                    android:layout_marginLeft="@dimen/d40"
+                    android:layout_marginTop="@dimen/d40"
+                    android:layout_marginBottom="@dimen/d40"
+                    android:background="@drawable/shape_device_sys_ed_bg"
+                    android:gravity="center_vertical"
+                    android:entries="@array/language_list"
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold"
+                    />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="*"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/txt_number"
+                        android:textStyle="bold"
+                        android:layout_marginLeft="@dimen/d28"
+                        />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/language_set_mode"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+                <RadioGroup
+                    android:id="@+id/device_sys_group_sip"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginTop="@dimen/d10"
+                    android:layout_marginBottom="@dimen/d20"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/device_sys_radio_language_on"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_yes"
+                        android:textColor="@drawable/radio_button_selector_txt2"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/radio_button_selector_bg2"
+                        android:drawablePadding="@dimen/d5"
+                        android:textSize="14px" />
+
+                    <RadioButton
+                        android:id="@+id/device_sys_radio_language_off"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_no"
+                        android:textColor="@drawable/radio_button_selector_txt2"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/radio_button_selector_bg2"
+                        android:drawablePadding="@dimen/d5"
+                        android:textSize="14px" />
+                </RadioGroup>
+
+
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_device_config_view_3"
+                android:layout_toRightOf="@+id/ll_device_config_view"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d180"
+                android:layout_marginLeft="@dimen/d24"
+                android:layout_marginRight="@dimen/d24"
+                android:layout_marginTop="@dimen/d30"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="*"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/txt_number"
+                        android:textStyle="bold"
+                        android:layout_marginTop="@dimen/d18"
+                        android:layout_marginLeft="@dimen/d28"
+                        />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:text="@string/str_device_selection_window"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+                <RadioGroup
+                    android:id="@+id/device_sys_group_window"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginTop="@dimen/d20"
+                    android:layout_marginBottom="@dimen/d20"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/device_sys_radio_window_on"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_device_sys_window_on"
+                        android:textColor="@drawable/radio_button_selector_txt2"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/radio_button_selector_bg2"
+                        android:drawablePadding="@dimen/d5"
+                        android:textSize="14px" />
+
+                    <RadioButton
+                        android:id="@+id/device_sys_radio_window_off"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_device_sys_window_off"
+                        android:textColor="@drawable/radio_button_selector_txt2"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/radio_button_selector_bg2"
+                        android:drawablePadding="@dimen/d5"
+                        android:textSize="14px" />
+                </RadioGroup>
+
+
+
+
+            </LinearLayout>
+
+
+
+            <LinearLayout
+                android:layout_below="@+id/ll_device_config_view_3"
+                android:layout_toRightOf="@+id/ll_device_config_view_2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="10dp"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/device_sys_save_settings_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d60"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginRight="@dimen/d24"
+                    android:gravity="center_vertical"
+                    android:drawableLeft="@mipmap/kssz_bao"
+                    android:paddingLeft="@dimen/d200"
+                    android:drawablePadding="@dimen/d15"
+                    android:background="@drawable/shape_bed_bg"
+                    android:textStyle="bold"
+                    android:text="@string/save_settings"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <TextView
+                    android:id="@+id/device_sys_language_settings_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d60"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginRight="@dimen/d24"
+                    android:layout_marginTop="@dimen/d15"
+                    android:gravity="center_vertical"
+                    android:drawableLeft="@mipmap/kssz_yu"
+                    android:drawablePadding="@dimen/d15"
+                    android:paddingLeft="@dimen/d200"
+                    android:background="@drawable/shape_bed_bg"
+                    android:textStyle="bold"
+                    android:text="@string/call_config"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <TextView
+                    android:id="@+id/device_sys_system_settings_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d60"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginRight="@dimen/d24"
+                    android:layout_marginTop="@dimen/d15"
+                    android:gravity="center_vertical"
+                    android:drawableLeft="@mipmap/kssz_xi"
+                    android:paddingLeft="@dimen/d200"
+                    android:drawablePadding="@dimen/d15"
+                    android:background="@drawable/shape_bed_bg"
+                    android:textStyle="bold"
+                    android:text="@string/system_settings"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+
+                <TextView
+                    android:id="@+id/device_sys_software_and_information_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d60"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginRight="@dimen/d24"
+                    android:layout_marginTop="15dp"
+                    android:gravity="center_vertical"
+                    android:drawableLeft="@mipmap/kssz_guan"
+                    android:paddingLeft="@dimen/d200"
+                    android:drawablePadding="@dimen/d15"
+                    android:background="@drawable/shape_bed_bg"
+                    android:text="@string/str_about"
+                    android:textStyle="bold"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+
+            </LinearLayout>
+
+
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+
+</layout>

callingdoor/src/main/res/layout-land/callingdoor_activation.xml

@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/d100"
             android:layout_marginTop="@dimen/d98"
-            android:text="请先激活设备"
+            android:text="@string/str_check_activation"
             android:textColor="@color/white"
             android:textSize="@dimen/font_size_32"
             android:textStyle="bold" />
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/d100"
             android:layout_marginTop="@dimen/d144"
-            android:text="设置右侧参数后激活"
+            android:text="@string/str_set_active_param"
             android:textColor="@color/white"
             android:textSize="@dimen/font_size_16"
             android:textStyle="bold" />
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d15"
-                android:text="智能健康 关爱互联系统"
+                android:text="@string/str_data_care"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_20" />
 
@@ -58,7 +58,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d10"
-                android:text="扫描二维码进行激活"
+                android:text="@string/str_scan_qr_code"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_13" />
 
@@ -67,162 +67,152 @@
                 android:layout_width="@dimen/d160"
                 android:layout_height="@dimen/d160"
                 android:layout_marginTop="@dimen/d10" />
-
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/d60"
-                android:layout_marginTop="@dimen/d10"
-                android:orientation="horizontal">
+                android:layout_marginTop="@dimen/d15"
+                >
 
                 <TextView
+                    android:id="@+id/activation_v_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="当前版本号:"
+                    android:text="@string/str_version"
+                    android:layout_marginLeft="@dimen/d118"
+                    android:textSize="@dimen/font_size_13"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_18"
                     android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/activation_v"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:text="V1.1.1"
+                    android:layout_toRightOf="@+id/activation_v_title"
                     android:layout_marginLeft="@dimen/d10"
-                    android:text="V1.0.1.0"
-                    android:textColor="@color/txt_setting"
-                    android:textSize="@dimen/font_size_16" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/d60"
-                android:layout_marginTop="@dimen/d15"
-                android:orientation="horizontal">
+                    android:textSize="@dimen/font_size_12"
+                    android:textColor="@color/txt_setting" />
 
                 <TextView
+                    android:id="@+id/activation_ip_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="本机IP:"
+                    android:layout_marginTop="@dimen/d15"
+                    android:text="@string/str_ip"
+                    android:layout_below="@+id/activation_v_title"
+                    android:layout_alignRight="@+id/activation_v_title"
+                    android:textSize="@dimen/font_size_13"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_18"
                     android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/activation_ip"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d15"
                     android:text="192.168.0.0"
-                    android:textColor="@color/txt_setting"
-                    android:textSize="@dimen/font_size_16" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/d60"
-                android:layout_marginTop="@dimen/d15"
-                android:orientation="horizontal">
+                    android:layout_below="@+id/activation_v_title"
+                    android:layout_toRightOf="@+id/activation_ip_title"
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_12"
+                    android:textColor="@color/txt_setting" />
 
                 <TextView
+                    android:id="@+id/activation_wg_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="网关:"
+                    android:layout_marginTop="@dimen/d15"
+                    android:layout_below="@+id/activation_ip_title"
+                    android:layout_alignRight="@+id/activation_ip_title"
+                    android:text="@string/str_gateway"
+                    android:textSize="@dimen/font_size_13"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_18"
                     android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/activation_wg"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d15"
+                    android:layout_toRightOf="@+id/activation_wg_title"
+                    android:layout_below="@+id/activation_ip_title"
                     android:text="192.168.0.0"
-                    android:textColor="@color/txt_setting"
-                    android:textSize="@dimen/font_size_16" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/d60"
-                android:layout_marginTop="@dimen/d15"
-                android:orientation="horizontal">
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_12"
+                    android:textColor="@color/txt_setting" />
 
                 <TextView
+                    android:id="@+id/activation_ym_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="掩码:"
+                    android:layout_below="@+id/activation_wg_title"
+                    android:layout_alignRight="@+id/activation_wg_title"
+                    android:layout_marginTop="@dimen/d15"
+                    android:text="@string/str_netmask"
+                    android:textSize="@dimen/font_size_13"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_18"
                     android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/activation_ym"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_marginTop="@dimen/d15"
+                    android:layout_below="@+id/activation_wg_title"
+                    android:layout_toRightOf="@+id/activation_ym_title"
                     android:text="192.168.0.0"
-                    android:textColor="@color/txt_setting"
-                    android:textSize="@dimen/font_size_16" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/d60"
-                android:layout_marginTop="@dimen/d15"
-                android:orientation="horizontal">
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_12"
+                    android:textColor="@color/txt_setting" />
 
                 <TextView
+                    android:id="@+id/activation_zcm_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="注册码:"
+                    android:layout_below="@+id/activation_ym_title"
+                    android:layout_alignRight="@+id/activation_ym_title"
+                    android:layout_marginTop="@dimen/d15"
+                    android:text="@string/str_register_id"
+                    android:textSize="@dimen/font_size_13"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_18"
                     android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/activation_zcm"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_below="@+id/activation_ym_title"
+                    android:layout_toRightOf="@+id/activation_zcm_title"
+                    android:layout_marginTop="@dimen/d15"
                     android:text="192.168.0.0"
-                    android:textColor="@color/txt_setting"
-                    android:textSize="@dimen/font_size_16" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/d60"
-                android:layout_marginTop="@dimen/d15"
-                android:orientation="horizontal">
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_10"
+                    android:textColor="@color/txt_setting" />
 
                 <TextView
+                    android:id="@+id/activation_fuq_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="服务器IP:"
+                    android:layout_alignRight="@+id/activation_zcm_title"
+                    android:layout_below="@+id/activation_zcm_title"
+                    android:layout_marginTop="@dimen/d15"
+                    android:text="@string/str_server_ip"
+                    android:textSize="@dimen/font_size_13"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_18"
                     android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/activation_fuq"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/d10"
+                    android:layout_below="@+id/activation_zcm_title"
+                    android:layout_toRightOf="@+id/activation_fuq_title"
+                    android:layout_marginTop="@dimen/d15"
                     android:text="192.168.0.0"
-                    android:textColor="@color/txt_setting"
-                    android:textSize="@dimen/font_size_16" />
-
-            </LinearLayout>
+                    android:layout_marginLeft="@dimen/d10"
+                    android:textSize="@dimen/font_size_10"
+                    android:textColor="@color/txt_setting" />
+            </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -232,39 +222,51 @@
                 android:layout_marginRight="@dimen/d19"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
+                <Button
+                    android:id="@+id/activation_language_button"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:gravity="center"
+                    android:text="@string/str_network_config"
+                    android:layout_weight="1"
+                    android:visibility="gone"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="16sp" />
 
                 <Button
                     android:id="@+id/activation_settings_button"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/d48"
-                    android:layout_weight="1"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/d14"
+                    android:layout_marginRight="@dimen/d14"
                     android:background="@drawable/shape_main_hos_txt_bg"
                     android:gravity="center"
-                    android:text="设备重启"
+                    android:text="@string/str_restart"
+                    android:layout_weight="1"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:textSize="16sp" />
 
                 <Button
                     android:id="@+id/activation_system_button"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/d48"
-                    android:layout_marginLeft="@dimen/d14"
+                    android:layout_height="match_parent"
                     android:layout_marginRight="@dimen/d14"
                     android:layout_weight="1"
                     android:background="@drawable/shape_main_hos_txt_bg"
                     android:gravity="center"
-                    android:text="系统设置"
+                    android:text="@string/str_system_settings"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:textSize="16sp" />
 
                 <Button
                     android:id="@+id/activation_services_button"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/d48"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@drawable/shape_main_hos_txt_bg"
                     android:gravity="center"
-                    android:text="服务器设置"
+                    android:text="@string/server_config"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:textSize="16sp" />
             </LinearLayout>

callingdoor/src/main/res/layout-land/callingdoor_activation_es.xml

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

callingdoor/src/main/res/layout-land/callingdoor_main_new.xml

@@ -190,7 +190,7 @@
                     android:id="@+id/title_layout_tv_hospital_hl_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="退出护理"
+                    android:text="@string/exit_nursing"
                     android:textColor="#FF8484"
                     android:textSize="@dimen/font_size_14" />
             </LinearLayout>
@@ -211,7 +211,7 @@
                 android:layout_centerVertical="true"
                 android:layout_centerHorizontal="true"
                 android:layout_marginRight="10dp"
-                android:text="护理中"
+                android:text="@string/nursing_title"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_18" />
 

callingdoor/src/main/res/layout-land/callingdoor_nurse.xml

@@ -24,7 +24,7 @@
                  <TextView
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
-                     android:text="选择一种方式验证进入医护功能"
+                     android:text="@string/str_select_type_for_nurse"
                      android:layout_marginLeft="@dimen/d20"
                      android:textSize="@dimen/font_size_18"
                      android:textColor="@color/black"
@@ -72,7 +72,7 @@
                 android:background="@drawable/selector_nuserlogin_btn"
                 android:gravity="center"
                 android:clickable="true"
-                android:text="进入医护"
+                android:text="@string/str_enter_medical_care"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_15" />
 
@@ -96,18 +96,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d22"
-                android:text="输入您的密码进入医护"
+                android:text="@string/input_password"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_15"
                 android:textStyle="bold" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/d8"
-                android:text="密码由数字组成"
-                android:textColor="@color/black"
-                android:textSize="@dimen/font_size_10" />
+<!--            <TextView-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginTop="@dimen/d8"-->
+<!--                android:text="密码由数字组成"-->
+<!--                android:textColor="@color/black"-->
+<!--                android:textSize="@dimen/font_size_10" />-->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/d50"
@@ -120,7 +120,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/d40"
-                    android:text="工号"
+                    android:text="@string/str_card_no"
                     android:textColor="@color/black"
                     android:textSize="@dimen/font_size_15"
                     android:textStyle="bold" />
@@ -155,7 +155,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/d40"
-                    android:text="密码"
+                    android:text="@string/str_password"
                     android:textColor="@color/black"
                     android:textSize="@dimen/font_size_15"
                     android:textStyle="bold"
@@ -168,7 +168,7 @@
                     android:layout_marginLeft="@dimen/d8"
                     android:layout_marginRight="@dimen/d60"
                     android:background="@drawable/selector_nuser_ed_d"
-                    android:hint="请输入密码"
+                    android:hint="@string/input_password"
                     android:paddingLeft="@dimen/d26"
                     android:textSize="@dimen/font_size_18"
                     android:textStyle="bold" />
@@ -189,7 +189,7 @@
                 android:background="@drawable/selector_nuserlogin_btn"
                 android:gravity="center"
                 android:clickable="true"
-                android:text="进入医护"
+                android:text="@string/str_enter_medical_care"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_15" />
 
@@ -208,7 +208,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="请在旁边刷卡处刷NFC卡进入医护"
+                android:text="@string/str_swipe_nfc_card"
                 android:layout_marginLeft="@dimen/d20"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/black"
@@ -216,14 +216,14 @@
                 android:layout_marginTop="@dimen/d47"
                 />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="使用有效NFC刷卡成功后直接进入医护"
-                android:textSize="@dimen/font_size_10"
-                android:textColor="@color/black"
-                android:layout_marginTop="@dimen/d13"
-                />
+<!--            <TextView-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:text="使用有效NFC刷卡成功后直接进入医护"-->
+<!--                android:textSize="@dimen/font_size_10"-->
+<!--                android:textColor="@color/black"-->
+<!--                android:layout_marginTop="@dimen/d13"-->
+<!--                />-->
             <ImageView
                 android:layout_width="@dimen/d244"
                 android:layout_height="@dimen/d280"

callingdoor/src/main/res/layout-land/callingdoor_nurse_main.xml

@@ -18,7 +18,7 @@
                   android:id="@+id/nurse_main_tx_1"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:text="您好，"
+                  android:text="@string/str_welcome"
                   android:textSize="@dimen/font_size_26"
                   android:textColor="@color/txt_number"
                   android:textStyle="bold"
@@ -29,7 +29,7 @@
                   android:id="@+id/nurse_main_tx_name"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:text="张舒婷护士"
+                  android:text="--"
                   android:textSize="@dimen/font_size_26"
                   android:textColor="@color/black"
                   android:layout_toRightOf="@+id/nurse_main_tx_1"
@@ -40,7 +40,7 @@
                   android:id="@+id/nurse_main_tx_2"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:text="当前为您的个人医护板块"
+                  android:text="@string/str_medical_care_area"
                   android:textSize="@dimen/font_size_18"
                   android:textColor="@color/text_black"
                   android:layout_below="@+id/nurse_main_tx_1"
@@ -57,7 +57,7 @@
                   android:layout_marginTop="@dimen/d30"
                   android:layout_marginLeft="@dimen/d40"
                   android:layout_marginRight="@dimen/d50"
-                  android:text="退出医护"
+                  android:text="@string/str_exit_medical_care"
                   android:clickable="true"
                   android:textSize="@dimen/font_size_15"
                   android:textColor="@color/white"
@@ -107,7 +107,7 @@
                 android:id="@+id/nurse_top_1_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="定位"
+                android:text="@string/str_position"
                 android:textSize="@dimen/font_size_24"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -118,7 +118,7 @@
                 android:id="@+id/nurse_main_1_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="住院部402房"
+                android:text="---"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
                 android:layout_marginTop="@dimen/d10"
@@ -147,7 +147,7 @@
                 android:id="@+id/nurse_top_2_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="巡房"
+                android:text="@string/str_patrol"
                 android:textSize="@dimen/font_size_24"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -158,7 +158,7 @@
                 android:id="@+id/nurse_main_2_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="住院部402房"
+                android:text="---"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
                 android:layout_marginTop="@dimen/d10"
@@ -187,7 +187,7 @@
                 android:id="@+id/nurse_top_3_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="进入护理"
+                android:text="@string/enter_nursing"
                 android:textSize="@dimen/font_size_24"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -198,10 +198,10 @@
                 android:id="@+id/nurse_main_3_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="该房病床进入护理"
+                android:text="@string/set_huli_2"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
-                android:layout_marginTop="@dimen/d10"
+                android:padding="@dimen/d10"
                 />
         </LinearLayout>
         <LinearLayout
@@ -227,10 +227,11 @@
                 android:id="@+id/nurse_top_4_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="设置提示语"
+                android:text="@string/set_hint"
                 android:textSize="@dimen/font_size_24"
                 android:textColor="@color/black"
                 android:textStyle="bold"
+                android:gravity="center"
                 android:layout_marginTop="@dimen/d32"
                 />
 
@@ -238,10 +239,10 @@
                 android:id="@+id/nurse_main_4_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="锁屏显示"
+                android:text="@string/set_hint_2"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
-                android:layout_marginTop="@dimen/d10"
+                android:padding="@dimen/d10"
                 />
         </LinearLayout>
     </LinearLayout>

callingdoor/src/main/res/layout-land/callingdoor_nurse_msg.xml

@@ -11,6 +11,7 @@
             android:layout_height="match_parent"
             android:background="#3A78EF"
             android:visibility="gone"
+
             android:orientation="vertical">
 
             <RelativeLayout
@@ -21,12 +22,14 @@
                 <!--设备号-->
                 <LinearLayout
                     android:id="@+id/msg_view_title_layout_return"
-                    android:layout_width="@dimen/d105"
+                    android:layout_width="wrap_content"
                     android:layout_height="@dimen/d30"
                     android:layout_marginLeft="20dp"
-                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:background="@drawable/shape_time_bu_bg"
                     android:clickable="true"
                     android:gravity="center"
+                    android:paddingRight="@dimen/d10"
+                    android:paddingLeft="@dimen/d10"
                     android:layout_centerVertical="true"
                     android:orientation="horizontal">
 
@@ -37,16 +40,18 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="6dp"
                         android:visibility="gone"
-                        android:background="@mipmap/return_w" />
+                        android:background="@mipmap/return_b" />
                     <!--医院名称-->
                     <TextView
                         android:id="@+id/msg_view_title_layout_tv_hospital_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="科室名称"
-                        android:textColor="@color/white"
+                        android:text=""
+                        android:singleLine="true"
+                        android:textColor="@color/delete_text_color"
                         android:textSize="@dimen/font_size_14" />
                 </LinearLayout>
+
                 <TextView
                     android:id="@+id/msg_view_title_layout_tv_no"
                     android:layout_width="wrap_content"
@@ -69,12 +74,12 @@
                     android:orientation="horizontal">
 
                     <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/d20"
+                        android:layout_height="@dimen/d20"
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
-                        android:background="@mipmap/riqi" />
+                        android:background="@mipmap/riqi_b" />
                     <!--日期-->
                     <TextClock
                         android:layout_width="wrap_content"
@@ -82,18 +87,18 @@
                         android:layout_gravity="center_vertical"
                         android:format12Hour="yyyy-MM-dd EEEE"
                         android:format24Hour="yyyy-MM-dd EEEE"
-                        android:textColor="@color/black"
+                        android:textColor="@color/white"
                         android:textSize="@dimen/font_size_14"
                         android:layout_marginLeft="@dimen/d5"
                         android:text="16:08"/>
 
                     <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/d20"
+                        android:layout_height="@dimen/d20"
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/d23"
                         android:layout_marginRight="4dp"
-                        android:background="@mipmap/shijian" />
+                        android:background="@mipmap/shijian_b" />
                     <!--时间-->
                     <TextClock
                         android:layout_width="wrap_content"
@@ -101,7 +106,7 @@
                         android:layout_gravity="center_vertical"
                         android:format12Hour="HH:mm"
                         android:format24Hour="HH:mm"
-                        android:textColor="@color/black"
+                        android:textColor="@color/white"
                         android:textSize="@dimen/font_size_14"
                         android:layout_marginLeft="@dimen/d5"
                         android:layout_marginRight="@dimen/d15"
@@ -224,7 +229,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@+id/nurse_msg_tx_1"
-                android:text="自定义输入"
+                android:text="@string/str_input_custom_info"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -236,7 +241,7 @@
                 android:id="@+id/nurse_msg_ed"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/d50"
-                android:hint="请保持安静不要吵闹"
+                android:hint="@string/str_be_quiet"
                 android:paddingLeft="@dimen/d26"
                 android:textSize="@dimen/font_size_18"
                 android:gravity="center_vertical"
@@ -284,7 +289,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_toRightOf="@+id/nurse_msg_tx_3"
-                    android:text="快捷提示语"
+                    android:text="@string/str_hint_text"
                     android:textSize="@dimen/font_size_18"
                     android:textColor="@color/black"
                     android:textStyle="bold"
@@ -302,7 +307,7 @@
                         android:layout_width="@dimen/d270"
                         android:layout_height="@dimen/d48"
                         android:gravity="center"
-                        android:text="保持安静"
+                        android:text="@string/str_be_quiet"
                         android:textSize="@dimen/font_size_16"
                         android:textColor="@color/text_name_color"
                         android:layout_marginTop="@dimen/d20"
@@ -315,7 +320,7 @@
                         android:layout_height="@dimen/d48"
                         android:layout_below="@+id/nurse_msg_tx_5"
                         android:gravity="center"
-                        android:text="请勿大声喧哗"
+                        android:text="@string/str_no_noise"
                         android:textSize="@dimen/font_size_16"
                         android:textColor="@color/text_name_color"
                         android:layout_marginTop="@dimen/d16"
@@ -328,7 +333,7 @@
                         android:layout_height="@dimen/d48"
                         android:layout_below="@+id/nurse_msg_tx_6"
                         android:gravity="center"
-                        android:text="正在如厕请勿进入"
+                        android:text="@string/str_no_entry"
                         android:textSize="@dimen/font_size_16"
                         android:textColor="@color/text_name_color"
                         android:layout_marginTop="@dimen/d16"
@@ -341,7 +346,7 @@
                         android:layout_height="@dimen/d48"
                         android:layout_toRightOf="@+id/nurse_msg_tx_5"
                         android:gravity="center"
-                        android:text="正在护理请勿打扰"
+                        android:text="@string/str_no_disturb"
                         android:textSize="@dimen/font_size_16"
                         android:textColor="@color/text_name_color"
                         android:layout_marginTop="@dimen/d20"
@@ -355,7 +360,7 @@
                         android:layout_below="@+id/nurse_msg_tx_5"
                         android:layout_toRightOf="@+id/nurse_msg_tx_6"
                         android:gravity="center"
-                        android:text="请勿探视"
+                        android:text="@string/str_no_visitation"
                         android:textSize="@dimen/font_size_16"
                         android:textColor="@color/text_name_color"
                         android:layout_marginTop="@dimen/d16"
@@ -369,7 +374,7 @@
                         android:layout_below="@+id/nurse_msg_tx_6"
                         android:layout_toRightOf="@+id/nurse_msg_tx_7"
                         android:gravity="center"
-                        android:text="请不要过多人聚集"
+                        android:text="@string/str_no_gather"
                         android:textSize="@dimen/font_size_16"
                         android:textColor="@color/text_name_color"
                         android:layout_marginTop="@dimen/d16"
@@ -419,7 +424,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_toRightOf="@+id/nurse_msg_tx_11"
-                    android:text="设置提示时间"
+                    android:text="@string/str_hint_time"
                     android:textSize="@dimen/font_size_18"
                     android:textColor="@color/black"
                     android:textStyle="bold"
@@ -432,7 +437,7 @@
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_11"
                     android:gravity="center"
-                    android:text="10分钟"
+                    android:text="@string/time_10min"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d20"
@@ -445,7 +450,7 @@
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_13"
                     android:gravity="center"
-                    android:text="30分钟"
+                    android:text="@string/time_30min"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d16"
@@ -458,7 +463,7 @@
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_14"
                     android:gravity="center"
-                    android:text="90分钟"
+                    android:text="@string/time_90min"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d16"
@@ -472,7 +477,7 @@
                     android:layout_below="@+id/nurse_msg_tx_11"
                     android:layout_toRightOf="@+id/nurse_msg_tx_13"
                     android:gravity="center"
-                    android:text="15分钟"
+                    android:text="@string/time_15min"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d20"
@@ -486,7 +491,7 @@
                     android:layout_below="@+id/nurse_msg_tx_13"
                     android:layout_toRightOf="@+id/nurse_msg_tx_14"
                     android:gravity="center"
-                    android:text="60分钟"
+                    android:text="@string/time_60min"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d16"
@@ -500,7 +505,7 @@
                     android:layout_below="@+id/nurse_msg_tx_14"
                     android:layout_toRightOf="@+id/nurse_msg_tx_15"
                     android:gravity="center"
-                    android:text="120分钟"
+                    android:text="@string/time_120min"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d16"
@@ -517,7 +522,7 @@
             android:layout_height="@dimen/d60"
             android:layout_gravity="center"
             android:gravity="center"
-            android:text="开始提示"
+            android:text="@string/str_confirm"
             android:textColor="@color/white"
             android:background="@drawable/shape_main_hos_txt_bg"
             android:layout_marginTop="@dimen/d26"

callingdoor/src/main/res/layout-land/callingdoor_setting_main.xml

@@ -33,7 +33,7 @@
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_toRightOf="@+id/settings_img"
-                  android:text="设备调试"
+                  android:text="@string/device_test"
                   android:textSize="@dimen/font_size_18"
                   android:layout_marginLeft="@dimen/d10"
                   android:textColor="@color/black"
@@ -74,7 +74,7 @@
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
                               android:layout_marginTop="@dimen/d12"
-                              android:text="服务器设置"
+                              android:text="@string/server_config"
                               android:textColor="@color/white"
                               android:textSize="@dimen/font_size_14"
                               android:textStyle="bold" />
@@ -86,7 +86,7 @@
                               android:layout_marginTop="@dimen/d21"
                               android:background="@drawable/shape_n_login_ed_bg"
                               android:gravity="center"
-                              android:text="立即设置"
+                              android:text="@string/str_start"
                               android:textColor="#3A78EF"
                               android:textSize="@dimen/font_size_10" />
                       </LinearLayout>
@@ -110,7 +110,7 @@
                           <TextView
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
-                              android:text="网络设置"
+                              android:text="@string/str_network_config"
                               android:textSize="@dimen/font_size_14"
                               android:textColor="@color/white"
                               android:textStyle="bold"
@@ -121,7 +121,7 @@
                               android:id="@+id/settings_main_2_tx"
                               android:layout_width="@dimen/d58"
                               android:layout_height="@dimen/d20"
-                              android:text="立即设置"
+                              android:text="@string/str_start"
                               android:textSize="@dimen/font_size_10"
                               android:textColor="#57D64E"
                               android:gravity="center"
@@ -150,7 +150,7 @@
                           <TextView
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
-                              android:text="硬件设置"
+                              android:text="@string/device_config"
                               android:textSize="@dimen/font_size_14"
                               android:textColor="@color/white"
                               android:textStyle="bold"
@@ -161,7 +161,7 @@
                               android:id="@+id/settings_main_top_3_tx"
                               android:layout_width="@dimen/d58"
                               android:layout_height="@dimen/d20"
-                              android:text="立即设置"
+                              android:text="@string/str_start"
                               android:textSize="@dimen/font_size_10"
                               android:textColor="@color/main_color"
                               android:gravity="center"
@@ -189,7 +189,7 @@
                           <TextView
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
-                              android:text="进入调试"
+                              android:text="@string/test_mode"
                               android:textSize="@dimen/font_size_14"
                               android:textColor="@color/white"
                               android:textStyle="bold"
@@ -200,7 +200,7 @@
                               android:id="@+id/settings_main_3_tx"
                               android:layout_width="@dimen/d58"
                               android:layout_height="@dimen/d20"
-                              android:text="开始调试"
+                              android:text="@string/str_start"
                               android:textSize="@dimen/font_size_10"
                               android:textColor="#FF924A"
                               android:gravity="center"
@@ -228,7 +228,7 @@
                           <TextView
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
-                              android:text="版本更新"
+                              android:text="@string/str_app_update"
                               android:textSize="@dimen/font_size_14"
                               android:textColor="@color/white"
                               android:textStyle="bold"
@@ -239,7 +239,7 @@
                               android:id="@+id/settings_main_4_tx"
                               android:layout_width="@dimen/d58"
                               android:layout_height="@dimen/d20"
-                              android:text="更新版本"
+                              android:text="@string/str_start"
                               android:textSize="@dimen/font_size_10"
                               android:textColor="#EE3B3B"
                               android:gravity="center"
@@ -247,14 +247,7 @@
                               android:background="@drawable/shape_n_login_ed_bg"
                               />
 
-                          <TextView
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:layout_marginTop="@dimen/d12"
-                              android:text="重启设备"
-                              android:textColor="@color/white"
-                              android:textSize="@dimen/font_size_14"
-                              android:textStyle="bold" />
+
                       </LinearLayout>
                       <LinearLayout
                           android:id="@+id/settings_main_5_ll"
@@ -272,12 +265,19 @@
                               android:src="@mipmap/cq"
                               android:layout_marginTop="@dimen/d22"
                               />
-
+                          <TextView
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:layout_marginTop="@dimen/d12"
+                              android:text="@string/reboot_device"
+                              android:textColor="@color/white"
+                              android:textSize="@dimen/font_size_14"
+                              android:textStyle="bold" />
                           <TextView
                               android:id="@+id/settings_main_5_tx"
                               android:layout_width="@dimen/d58"
                               android:layout_height="@dimen/d20"
-                              android:text="立即重启"
+                              android:text="@string/str_start"
                               android:textSize="@dimen/font_size_10"
                               android:textColor="#FF924A"
                               android:gravity="center"
@@ -318,7 +318,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@+id/settings_img1"
-                android:text="设备信息"
+                android:text="@string/str_device_info"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -404,7 +404,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="网关"
+                    android:text="@string/str_gateway"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -469,7 +469,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="服务器ID"
+                    android:text="@string/str_server_ip"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -502,7 +502,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="语音ID"
+                    android:text="SIP ID:"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -533,7 +533,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="语音类型"
+                    android:text="@string/voice_type"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -545,7 +545,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
 
-                    android:text="000类型"
+                    android:text="000"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14" />
             </LinearLayout>
@@ -566,7 +566,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="语音服务器"
+                    android:text="SIP server:"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -577,7 +577,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="服务器"
+                    android:text="--"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14" />
             </LinearLayout>
@@ -597,7 +597,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="APP版本"
+                    android:text="APP version"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -630,7 +630,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="发布日期"
+                    android:text="@string/str_app_release_date"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -664,7 +664,7 @@
                 android:id="@+id/settings_img2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="扫描二维码"
+                android:text="@string/str_device_qr"
                 android:drawableLeft="@mipmap/saom"
                 android:drawablePadding="@dimen/d8"
                 android:textSize="@dimen/font_size_18"

callingdoor/src/main/res/layout-land/callingdoor_test_main.xml

@@ -40,25 +40,26 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
-                android:text="请输入目标SIP账号"
+                android:text="@string/test_target_sip_account"
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:textSize="@dimen/font_size_18"
                 android:gravity="center" />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/d7"
-                android:text="输入账号进行测试"
-                android:textColor="#7D7D7D"
-                android:textSize="@dimen/font_size_13"
-                android:gravity="center" />
+<!--            <TextView-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginTop="@dimen/d7"-->
+<!--                android:text="输入账号进行测试"-->
+<!--                android:textColor="#7D7D7D"-->
+<!--                android:textSize="@dimen/font_size_13"-->
+<!--                android:visibility="gone"-->
+<!--                android:gravity="center" />-->
 
             <EditText
                 android:id="@+id/password_ed"
                 android:layout_width="@dimen/d383"
                 android:layout_height="@dimen/d52"
-                android:hint="请输入账号"
+                android:hint="@string/test_hint_sip_account"
                 android:paddingLeft="@dimen/d26"
                 android:textSize="@dimen/font_size_18"
                 android:gravity="center_vertical"
@@ -73,7 +74,7 @@
                 android:layout_height="@dimen/d48"
                 android:gravity="center"
                 android:background="@drawable/shape_main_hos_txt_bg"
-                android:text="呼叫测试"
+                android:text="@string/test_sip_call"
                 android:textSize="16sp"
                 android:layout_marginTop="@dimen/d20"
 
@@ -96,7 +97,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="66dp"
-                android:text="外接设备测试"
+                android:text="@string/test_peripheral"
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:textSize="@dimen/font_size_18"
@@ -105,7 +106,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d7"
-                android:text="请检查外接设备是否已连接再开始测试"
+                android:text="@string/test_peripheral_connect_check"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_13"
                 android:gravity="center" />
@@ -123,7 +124,7 @@
                     android:layout_height="@dimen/d48"
                     android:gravity="center"
                     android:background="@drawable/shape_main_hos_txt_bg"
-                    android:text="手柄按键测试"
+                    android:text="@string/test_handle_call_button"
                     android:textSize="16sp"
 
                     android:textColor="@drawable/selector_bottom_btn_text_color"/>
@@ -149,9 +150,8 @@
                     android:layout_height="@dimen/d48"
                     android:gravity="center"
                     android:background="@drawable/shape_main_hos_txt_bg"
-                    android:text="面板呼叫测试"
+                    android:text="@string/test_device_call_button"
                     android:textSize="16sp"
-
                     android:textColor="@drawable/selector_bottom_btn_text_color"/>
                 <ImageView
                     android:id="@+id/mbh_img"
@@ -175,9 +175,8 @@
                     android:layout_height="@dimen/d48"
                     android:gravity="center"
                     android:background="@drawable/shape_main_hos_txt_bg"
-                    android:text="面板呼叫测试"
+                    android:text="@string/test_device_cancel_button"
                     android:textSize="16sp"
-
                     android:textColor="@drawable/selector_bottom_btn_text_color"/>
                 <ImageView
                     android:id="@+id/mbhjjqx_img"
@@ -188,7 +187,32 @@
                     android:layout_marginLeft="@dimen/d8"
                     />
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/text_ll_5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d16"
+                android:gravity="center"
+                android:orientation="horizontal">
 
+                <Button
+                    android:id="@+id/sos_button"
+                    android:layout_width="@dimen/d383"
+                    android:layout_height="@dimen/d48"
+                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:gravity="center"
+                    android:text="@string/test_sos_button"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="16sp" />
+
+                <ImageView
+                    android:id="@+id/sos_img"
+                    android:layout_width="@dimen/d16"
+                    android:layout_height="@dimen/d16"
+                    android:layout_marginLeft="@dimen/d8"
+                    android:background="@mipmap/gou"
+                    android:visibility="invisible" />
+            </LinearLayout>
             <LinearLayout
 
                 android:layout_width="match_parent"
@@ -204,7 +228,7 @@
                     android:gravity="center_vertical"
                     android:background="@drawable/shape_main_hos_txt_bg"
                     android:drawableLeft="@mipmap/lu"
-                    android:text="录音测试（按住按钮说话10s）"
+                    android:text="@string/test_mic_record"
                     android:textSize="16sp"
                     android:paddingLeft="@dimen/d88"
                     android:drawablePadding="@dimen/d16"

callingdoor/src/main/res/layout-land/item_bed.xml

@@ -36,15 +36,20 @@
                 android:id="@+id/tv_bed_card_no"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="床位号"
+                android:text="@string/door_hos_title_3"
                 android:textColor="@color/white"
-                android:textSize="18sp"/>
+                android:textSize="18sp" />
         </LinearLayout>
 
-        <TextView
+        <com.wdkl.ncs.android.lib.widget.MarqueeTextView
             android:id="@+id/tv_bed_name"
             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:layout_toRightOf="@+id/ll_bed"
             android:text="张小斐"
             android:layout_marginLeft="@dimen/d8"

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

@@ -9,6 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/d28"
+        android:layout_marginBottom="@dimen/d15"
         >
 
         <LinearLayout

callingdoor/src/main/res/layout-land/main_password_dialog.xml

@@ -25,19 +25,19 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:gravity="center"
-            android:text="请输入管理员密码"
+            android:text="@string/input_password"
             android:textColor="@color/black"
             android:textSize="@dimen/font_size_18"
             android:textStyle="bold" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/d7"
-            android:gravity="center"
-            android:text="查看设备信息需管理权限"
-            android:textColor="#7D7D7D"
-            android:textSize="@dimen/font_size_18" />
+<!--        <TextView-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="@dimen/d7"-->
+<!--            android:gravity="center"-->
+<!--            android:text="查看设备信息需管理权限"-->
+<!--            android:textColor="#7D7D7D"-->
+<!--            android:textSize="@dimen/font_size_18" />-->
 
         <EditText
             android:id="@+id/password_ed"
@@ -47,7 +47,6 @@
             android:layout_marginTop="@dimen/d16"
             android:background="@drawable/shape_n_login_ed_bg2"
             android:gravity="center_vertical"
-            android:hint="请输入管理密码"
             android:paddingLeft="@dimen/d26"
             android:textSize="@dimen/font_size_18"
             android:textStyle="bold" />
@@ -66,7 +65,7 @@
                 android:layout_height="@dimen/d48"
                 android:background="@drawable/shape_password_bt_bg"
                 android:gravity="center"
-                android:text="关闭"
+                android:text="@string/str_cancel"
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="16sp" />
 
@@ -77,7 +76,7 @@
                 android:layout_marginLeft="@dimen/d31"
                 android:background="@drawable/shape_main_hos_txt_bg"
                 android:gravity="center"
-                android:text="确定"
+                android:text="@string/str_confirm"
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="16sp" />
         </LinearLayout>

callingdoor/src/main/res/layout-land/main_reinforcements_dialog.xml

@@ -25,7 +25,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:text="增援已发出，请耐心等待回应"
+            android:text="@string/reinforce_sent"
             android:textColor="@color/black"
             android:textStyle="bold"
             android:textSize="@dimen/font_size_18"

callingdoor/src/main/res/layout-land/main_restart_dialog.xml

@@ -23,19 +23,19 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="确认重启该设备？"
+        android:text="@string/str_reboot_check"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"
         android:gravity="center" />
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/d7"
-        android:text="点击确认后设备开始重启"
-        android:textColor="#7D7D7D"
-        android:textSize="@dimen/font_size_18"
-        android:gravity="center" />
+<!--    <TextView-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginTop="@dimen/d7"-->
+<!--        android:text="点击确认后设备开始重启"-->
+<!--        android:textColor="#7D7D7D"-->
+<!--        android:textSize="@dimen/font_size_18"-->
+<!--        android:gravity="center" />-->
 
 
     <LinearLayout
@@ -51,7 +51,7 @@
             android:layout_height="@dimen/d48"
             android:gravity="center"
             android:background="@drawable/shape_password_bt_bg"
-            android:text="取消"
+            android:text="@string/str_cancel"
             android:textSize="16sp"
 
             android:textColor="@drawable/selector_bottom_btn_text_color"/>
@@ -62,7 +62,7 @@
             android:layout_height="@dimen/d48"
             android:gravity="center"
             android:background="@drawable/shape_main_hos_txt_bg"
-            android:text="确定"
+            android:text="@string/str_confirm"
             android:textSize="16sp"
             android:layout_marginLeft="@dimen/d31"
             android:textColor="@drawable/selector_bottom_btn_text_color"/>

callingdoor/src/main/res/layout-land/main_server_dialog.xml

@@ -25,19 +25,19 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:gravity="center"
-            android:text="请设置服务器地址"
+            android:text="@string/str_server_ip_setting"
             android:textColor="@color/black"
             android:textSize="@dimen/font_size_18"
             android:textStyle="bold" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/d6"
-            android:gravity="center"
-            android:text="只可输入数字和小数点"
-            android:textColor="#7D7D7D"
-            android:textSize="@dimen/font_size_18" />
+<!--        <TextView-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="@dimen/d6"-->
+<!--            android:gravity="center"-->
+<!--            android:text="只可输入数字和小数点"-->
+<!--            android:textColor="#7D7D7D"-->
+<!--            android:textSize="@dimen/font_size_18" />-->
 
         <EditText
             android:id="@+id/server_ed"
@@ -48,7 +48,7 @@
             android:background="@drawable/shape_n_login_ed_bg2"
             android:digits="1234567890."
             android:gravity="center_vertical"
-            android:hint="请输入服务器地址"
+            android:hint="@string/str_server_ip_tips"
             android:paddingLeft="@dimen/d26"
             android:textSize="@dimen/font_size_18"
             android:textStyle="bold" />
@@ -68,7 +68,7 @@
                 android:layout_height="@dimen/d48"
                 android:background="@drawable/shape_main_hos_txt_bg"
                 android:gravity="center"
-                android:text="确定"
+                android:text="@string/str_confirm"
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="16sp" />
 
@@ -79,7 +79,7 @@
                 android:layout_marginLeft="@dimen/d31"
                 android:background="@drawable/shape_main_hos_txt_bg"
                 android:gravity="center"
-                android:text="重置"
+                android:text="@string/str_reset"
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="16sp" />
         </LinearLayout>

callingdoor/src/main/res/layout-land/main_version_dialog.xml

@@ -21,7 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="23dp"
-        android:text="当前设备版本号"
+        android:text="@string/version_title"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"
@@ -39,7 +39,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/d12"
-        android:text="发布日期"
+        android:text="@string/str_app_release_date"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"
@@ -60,7 +60,7 @@
         android:layout_marginBottom="@dimen/d67"
         android:gravity="center"
         android:background="@drawable/shape_main_hos_txt_bg"
-        android:text="检测更新"
+        android:text="@string/check_update"
         android:textSize="16sp"
         android:layout_marginTop="@dimen/d35"
         android:textColor="@drawable/selector_bottom_btn_text_color"/>

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

@@ -77,7 +77,7 @@
                         android:id="@+id/f_tx_people"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="病房人数"
+                        android:text="@string/door_hos_title_1"
                         android:layout_centerHorizontal="true"
                         android:textSize="@dimen/font_size_22"
                         android:textColor="@color/black"
@@ -118,7 +118,7 @@
                         android:id="@+id/f_tx_bed"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="空余床位"
+                        android:text="@string/door_hos_title_2"
                         android:textSize="@dimen/font_size_22"
                         android:textColor="@color/black"
                         android:layout_marginTop="16dp"

callingdoor/src/main/res/layout-land/nurse_huli_dialog.xml

@@ -17,17 +17,16 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="102床、103床、104床、105床"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"
+        android:visibility="gone"
         android:gravity="center" />
     <TextView
         android:id="@+id/hili_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="以上病床护理中，确认退出？"
         android:textColor="#7D7D7D"
         android:textSize="@dimen/font_size_18"
         android:gravity="center" />
@@ -39,7 +38,7 @@
         android:layout_marginBottom="@dimen/d35"
         android:gravity="center"
         android:background="@drawable/shape_huli_dialog_bt_bg"
-        android:text="进入护理"
+        android:text="@string/enter_nursing"
         android:textSize="16sp"
         android:textColor="@drawable/selector_bottom_btn_text_color"/>
 

callingdoor/src/main/res/layout-land/nurse_patrol_dialog.xml

@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="已巡房：住院部205房"
+        android:text="@string/str_patrol"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"

callingdoor/src/main/res/layout-land/nurse_positioning_dialog.xml

@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="已定位当前位置：住院部"
+        android:text="@string/str_positioned"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"

callingdoor/src/main/res/layout/call_config_dialog.xml

@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="23dp"
             android:gravity="center"
-            android:text="通话设置"
+            android:text="@string/call_config"
             android:textColor="@color/black"
             android:textSize="@dimen/font_size_18"
             android:textStyle="bold" />

callingdoor/src/main/res/layout/calling_babymom_main.xml

@@ -238,7 +238,7 @@
                     android:paddingRight="@dimen/d18"
                     android:paddingTop="@dimen/d5"
                     android:paddingBottom="@dimen/d5"
-                    android:text="宝妈姓名"
+                    android:text="@string/door_mom_title_2"
                     android:textStyle="bold"
                     android:textColor="@color/white"
                     android:textSize="32sp"
@@ -297,7 +297,7 @@
                     android:paddingRight="@dimen/d18"
                     android:paddingTop="@dimen/d5"
                     android:paddingBottom="@dimen/d5"
-                    android:text="宝妈年龄"
+                    android:text="@string/door_mom_title_3"
                     android:textStyle="bold"
                     android:textColor="@color/white"
                     android:textSize="32sp"
@@ -346,7 +346,7 @@
             android:id="@+id/babymom_mian_title_tx"
             android:layout_width="@dimen/d230"
             android:layout_height="@dimen/d60"
-            android:text="宝妈信息"
+            android:text="@string/door_mom_title_1"
             android:textStyle="bold"
             android:textColor="@color/white"
             android:textSize="32sp"
@@ -409,7 +409,7 @@
                         android:paddingRight="@dimen/d18"
                         android:paddingTop="@dimen/d5"
                         android:paddingBottom="@dimen/d5"
-                        android:text="宝宝姓名"
+                        android:text="@string/door_mom_title_5"
                         android:textStyle="bold"
                         android:textColor="@color/white"
                         android:textSize="28sp"
@@ -455,7 +455,7 @@
                         android:paddingRight="@dimen/d18"
                         android:paddingTop="@dimen/d5"
                         android:paddingBottom="@dimen/d5"
-                        android:text="宝宝性别"
+                        android:text="@string/door_mom_title_6"
                         android:textStyle="bold"
                         android:textColor="@color/white"
                         android:textSize="28sp"
@@ -503,7 +503,7 @@
             android:id="@+id/babymom_mian_title_tx3"
             android:layout_width="@dimen/d230"
             android:layout_height="@dimen/d60"
-            android:text="宝宝信息"
+            android:text="@string/door_mom_title_4"
             android:textStyle="bold"
             android:textColor="@color/white"
             android:textSize="32sp"

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

@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="#F7F7F7">
+
+        <include
+            android:id="@+id/activity_calling_door_layout_title"
+            layout="@layout/view_title_layout" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/ll_sip_config_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d24"
+                android:layout_marginRight="@dimen/d24"
+                android:layout_marginTop="@dimen/d30"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/nurse_msg_tx_1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="*"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/txt_number"
+                        android:textStyle="bold"
+                        android:layout_marginTop="@dimen/d18"
+                        android:layout_marginLeft="@dimen/d28"
+                        />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:text="@string/str_device_selection_type"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+
+                <Spinner
+                    android:id="@+id/device_sys_ed_1"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d52"
+                    android:layout_marginRight="@dimen/d40"
+                    android:layout_marginLeft="@dimen/d40"
+                    android:layout_marginTop="@dimen/d40"
+                    android:layout_marginBottom="@dimen/d40"
+                    android:background="@drawable/shape_device_sys_ed_bg"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d26"
+                    android:entries="@array/language_list"
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold"
+                    />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d24"
+                android:layout_marginRight="@dimen/d24"
+                android:layout_marginTop="@dimen/d30"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="*"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/txt_number"
+                        android:textStyle="bold"
+                        android:layout_marginTop="@dimen/d18"
+                        android:layout_marginLeft="@dimen/d28"
+                        />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:text="@string/str_device_selection_language"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+                <Spinner
+                    android:id="@+id/device_sys_ed_2"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d52"
+                    android:layout_marginRight="@dimen/d40"
+                    android:layout_marginLeft="@dimen/d40"
+                    android:layout_marginTop="@dimen/d40"
+                    android:layout_marginBottom="@dimen/d40"
+                    android:background="@drawable/shape_device_sys_ed_bg"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d26"
+                    android:entries="@array/language_list"
+                    android:textSize="@dimen/font_size_18"
+                    android:textStyle="bold"
+                    />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="*"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/txt_number"
+                        android:textStyle="bold"
+                        android:layout_marginLeft="@dimen/d28"
+                        />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/language_set_mode"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+                <RadioGroup
+                    android:id="@+id/device_sys_group_sip"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginTop="@dimen/d10"
+                    android:layout_marginBottom="@dimen/d20"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/device_sys_radio_sip_on"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_yes"
+                        android:textColor="@drawable/radio_button_selector_txt"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/radio_button_selector_bg"
+                        android:drawablePadding="@dimen/d5"
+                        android:textSize="14px" />
+
+                    <RadioButton
+                        android:id="@+id/device_sys_radio_sip_off"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_no"
+                        android:textColor="@drawable/radio_button_selector_txt"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/radio_button_selector_bg"
+                        android:drawablePadding="@dimen/d5"
+                        android:textSize="14px" />
+                </RadioGroup>
+
+
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d24"
+                android:layout_marginRight="@dimen/d24"
+                android:layout_marginTop="@dimen/d30"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="*"
+                        android:textSize="@dimen/font_size_18"
+                        android:textColor="@color/txt_number"
+                        android:textStyle="bold"
+                        android:layout_marginTop="@dimen/d18"
+                        android:layout_marginLeft="@dimen/d28"
+                        />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:text="@string/str_device_selection_window"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+                <RadioGroup
+                    android:id="@+id/device_sys_group_window"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginTop="@dimen/d10"
+                    android:layout_marginBottom="@dimen/d20"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/device_sys_radio_window_on"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_device_sys_window_on"
+                        android:textColor="@drawable/radio_button_selector_txt"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/radio_button_selector_bg"
+                        android:drawablePadding="@dimen/d5"
+                        android:textSize="14px" />
+
+                    <RadioButton
+                        android:id="@+id/device_sys_radio_window_off"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_device_sys_window_off"
+                        android:textColor="@drawable/radio_button_selector_txt"
+                        android:layout_marginLeft="@dimen/d10"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/radio_button_selector_bg"
+                        android:drawablePadding="@dimen/d5"
+                        android:textSize="14px" />
+                </RadioGroup>
+
+
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="10dp"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/device_sys_save_settings_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d60"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginRight="@dimen/d24"
+                    android:gravity="center_vertical"
+                    android:drawableLeft="@mipmap/kssz_bao"
+                    android:paddingLeft="@dimen/d200"
+                    android:drawablePadding="@dimen/d15"
+                    android:background="@drawable/shape_bed_bg"
+                    android:textStyle="bold"
+                    android:text="@string/save_settings"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <TextView
+                    android:id="@+id/device_sys_language_settings_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d60"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginRight="@dimen/d24"
+                    android:layout_marginTop="@dimen/d15"
+                    android:gravity="center_vertical"
+                    android:drawableLeft="@mipmap/kssz_yu"
+                    android:drawablePadding="@dimen/d15"
+                    android:paddingLeft="@dimen/d200"
+                    android:background="@drawable/shape_bed_bg"
+                    android:textStyle="bold"
+                    android:text="@string/language_settings"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <TextView
+                    android:id="@+id/device_sys_system_settings_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d60"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginRight="@dimen/d24"
+                    android:layout_marginTop="@dimen/d15"
+                    android:gravity="center_vertical"
+                    android:drawableLeft="@mipmap/kssz_xi"
+                    android:paddingLeft="@dimen/d200"
+                    android:drawablePadding="@dimen/d15"
+                    android:background="@drawable/shape_bed_bg"
+                    android:textStyle="bold"
+                    android:text="@string/system_settings"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+
+                <TextView
+                    android:id="@+id/device_sys_software_and_information_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d60"
+                    android:layout_marginLeft="@dimen/d24"
+                    android:layout_marginRight="@dimen/d24"
+                    android:layout_marginTop="15dp"
+                    android:gravity="center_vertical"
+                    android:drawableLeft="@mipmap/kssz_guan"
+                    android:paddingLeft="@dimen/d200"
+                    android:drawablePadding="@dimen/d15"
+                    android:background="@drawable/shape_bed_bg"
+                    android:text="关于主机"
+                    android:textStyle="bold"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+
+            </LinearLayout>
+
+
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</layout>

callingdoor/src/main/res/layout/callingdoor_activation.xml

@@ -17,7 +17,7 @@
             android:id="@+id/activation_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="请先激活设备"
+            android:text="@string/str_check_activation"
             android:textStyle="bold"
             android:textSize="@dimen/font_size_32"
             android:textColor="@color/white"
@@ -29,7 +29,7 @@
             android:id="@+id/activation_title_msg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="设置右侧参数后激活"
+            android:text="@string/str_set_active_param"
             android:textSize="@dimen/font_size_16"
             android:textColor="@color/white"
             android:layout_below="@+id/activation_title"
@@ -53,7 +53,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="智能健康 关爱互联系统"
+                    android:text="@string/str_data_care"
                     android:textSize="@dimen/font_size_18"
                     android:textColor="@color/black"
                     android:layout_marginTop="@dimen/d35" />
@@ -61,7 +61,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="扫描二维码进行激活"
+                    android:text="@string/str_scan_qr_code"
                     android:textSize="@dimen/font_size_10"
                     android:textColor="@color/black"
                     android:layout_marginTop="@dimen/d10" />
@@ -72,17 +72,18 @@
                     android:layout_height="@dimen/d112"
                     android:layout_marginTop="@dimen/d10" />
 
-                <LinearLayout
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="@dimen/d10"
-                    android:layout_marginLeft="@dimen/d90">
+                    android:layout_marginTop="@dimen/d15"
+                    >
 
                     <TextView
+                        android:id="@+id/activation_v_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="当前版本号:"
+                        android:text="@string/str_version"
+                        android:layout_marginLeft="@dimen/d118"
                         android:textSize="@dimen/font_size_13"
                         android:textColor="@color/black"
                         android:textStyle="bold" />
@@ -91,24 +92,20 @@
                         android:id="@+id/activation_v"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="V1.0.1.0"
+                        android:text="V1.1.1"
+                        android:layout_toRightOf="@+id/activation_v_title"
                         android:layout_marginLeft="@dimen/d10"
-                        android:textSize="@dimen/font_size_10"
+                        android:textSize="@dimen/font_size_12"
                         android:textColor="@color/txt_setting" />
 
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginLeft="@dimen/d108"
-                    android:layout_marginTop="@dimen/d15">
-
                     <TextView
+                        android:id="@+id/activation_ip_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="本机IP:"
+                        android:layout_marginTop="@dimen/d15"
+                        android:text="@string/str_ip"
+                        android:layout_below="@+id/activation_v_title"
+                        android:layout_alignRight="@+id/activation_v_title"
                         android:textSize="@dimen/font_size_13"
                         android:textColor="@color/black"
                         android:textStyle="bold" />
@@ -117,24 +114,22 @@
                         android:id="@+id/activation_ip"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d15"
                         android:text="192.168.0.0"
+                        android:layout_below="@+id/activation_v_title"
+                        android:layout_toRightOf="@+id/activation_ip_title"
                         android:layout_marginLeft="@dimen/d10"
-                        android:textSize="@dimen/font_size_10"
+                        android:textSize="@dimen/font_size_12"
                         android:textColor="@color/txt_setting" />
 
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginLeft="@dimen/d116"
-                    android:layout_marginTop="@dimen/d15">
-
                     <TextView
+                        android:id="@+id/activation_wg_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="网关:"
+                        android:layout_marginTop="@dimen/d15"
+                        android:layout_below="@+id/activation_ip_title"
+                        android:layout_alignRight="@+id/activation_ip_title"
+                        android:text="@string/str_gateway"
                         android:textSize="@dimen/font_size_13"
                         android:textColor="@color/black"
                         android:textStyle="bold" />
@@ -143,24 +138,22 @@
                         android:id="@+id/activation_wg"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d15"
+                        android:layout_toRightOf="@+id/activation_wg_title"
+                        android:layout_below="@+id/activation_ip_title"
                         android:text="192.168.0.0"
                         android:layout_marginLeft="@dimen/d10"
-                        android:textSize="@dimen/font_size_10"
+                        android:textSize="@dimen/font_size_12"
                         android:textColor="@color/txt_setting" />
 
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginLeft="@dimen/d116"
-                    android:layout_marginTop="@dimen/d15">
-
                     <TextView
+                        android:id="@+id/activation_ym_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="掩码:"
+                        android:layout_below="@+id/activation_wg_title"
+                        android:layout_alignRight="@+id/activation_wg_title"
+                        android:layout_marginTop="@dimen/d15"
+                        android:text="@string/str_netmask"
                         android:textSize="@dimen/font_size_13"
                         android:textColor="@color/black"
                         android:textStyle="bold" />
@@ -169,24 +162,22 @@
                         android:id="@+id/activation_ym"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d15"
+                        android:layout_below="@+id/activation_wg_title"
+                        android:layout_toRightOf="@+id/activation_ym_title"
                         android:text="192.168.0.0"
                         android:layout_marginLeft="@dimen/d10"
-                        android:textSize="@dimen/font_size_10"
+                        android:textSize="@dimen/font_size_12"
                         android:textColor="@color/txt_setting" />
 
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginLeft="@dimen/d108"
-                    android:layout_marginTop="@dimen/d15">
-
                     <TextView
+                        android:id="@+id/activation_zcm_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="注册码:"
+                        android:layout_below="@+id/activation_ym_title"
+                        android:layout_alignRight="@+id/activation_ym_title"
+                        android:layout_marginTop="@dimen/d15"
+                        android:text="@string/str_register_id"
                         android:textSize="@dimen/font_size_13"
                         android:textColor="@color/black"
                         android:textStyle="bold" />
@@ -195,24 +186,22 @@
                         android:id="@+id/activation_zcm"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_below="@+id/activation_ym_title"
+                        android:layout_toRightOf="@+id/activation_zcm_title"
+                        android:layout_marginTop="@dimen/d15"
                         android:text="192.168.0.0"
                         android:layout_marginLeft="@dimen/d10"
                         android:textSize="@dimen/font_size_10"
                         android:textColor="@color/txt_setting" />
 
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginLeft="@dimen/d100"
-                    android:layout_marginTop="@dimen/d15">
-
                     <TextView
+                        android:id="@+id/activation_fuq_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="服务器IP:"
+                        android:layout_alignRight="@+id/activation_zcm_title"
+                        android:layout_below="@+id/activation_zcm_title"
+                        android:layout_marginTop="@dimen/d15"
+                        android:text="@string/str_server_ip"
                         android:textSize="@dimen/font_size_13"
                         android:textColor="@color/black"
                         android:textStyle="bold" />
@@ -221,12 +210,15 @@
                         android:id="@+id/activation_fuq"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_below="@+id/activation_zcm_title"
+                        android:layout_toRightOf="@+id/activation_fuq_title"
+                        android:layout_marginTop="@dimen/d15"
                         android:text="192.168.0.0"
                         android:layout_marginLeft="@dimen/d10"
                         android:textSize="@dimen/font_size_10"
                         android:textColor="@color/txt_setting" />
+                </RelativeLayout>
 
-                </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -237,14 +229,27 @@
                 android:layout_marginBottom="@dimen/d50"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
+                <Button
+                    android:id="@+id/activation_language_button"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:gravity="center"
+                    android:text="@string/str_network_config"
+                    android:layout_weight="1"
+                    android:visibility="gone"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="16sp" />
 
                 <Button
                     android:id="@+id/activation_settings_button"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/d48"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/d14"
+                    android:layout_marginRight="@dimen/d14"
                     android:background="@drawable/shape_main_hos_txt_bg"
                     android:gravity="center"
-                    android:text="设备重启"
+                    android:text="@string/str_restart"
                     android:layout_weight="1"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:textSize="16sp" />
@@ -252,24 +257,23 @@
                 <Button
                     android:id="@+id/activation_system_button"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/d48"
-                    android:layout_marginLeft="@dimen/d14"
+                    android:layout_height="match_parent"
                     android:layout_marginRight="@dimen/d14"
                     android:layout_weight="1"
                     android:background="@drawable/shape_main_hos_txt_bg"
                     android:gravity="center"
-                    android:text="系统设置"
+                    android:text="@string/str_system_settings"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:textSize="16sp" />
 
                 <Button
                     android:id="@+id/activation_services_button"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/d48"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@drawable/shape_main_hos_txt_bg"
                     android:gravity="center"
-                    android:text="服务器设置"
+                    android:text="@string/server_config"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:textSize="16sp" />
             </LinearLayout>

callingdoor/src/main/res/layout/callingdoor_nurse.xml

@@ -24,7 +24,7 @@
                  <TextView
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
-                     android:text="选择一种方式验证进入医护功能"
+                     android:text="@string/str_select_type_for_nurse"
                      android:layout_marginLeft="@dimen/d20"
                      android:textSize="@dimen/font_size_18"
                      android:textColor="@color/black"
@@ -95,18 +95,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d17"
-                android:text="输入您的密码进入医护"
+                android:text="@string/input_password"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_15"
                 android:textStyle="bold" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/d8"
-                android:text="密码由数字组成"
-                android:textColor="@color/black"
-                android:textSize="@dimen/font_size_10" />
+<!--            <TextView-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginTop="@dimen/d8"-->
+<!--                android:text="密码由数字组成"-->
+<!--                android:textColor="@color/black"-->
+<!--                android:textSize="@dimen/font_size_10" />-->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/d50"
@@ -119,7 +119,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/d40"
-                    android:text="工号"
+                    android:text="@string/str_card_no"
                     android:textColor="@color/black"
                     android:textSize="@dimen/font_size_15"
                     android:textStyle="bold" />
@@ -131,15 +131,12 @@
                     android:layout_marginLeft="@dimen/d8"
                     android:layout_marginRight="@dimen/d60"
                     android:background="@drawable/selector_nuser_ed_d"
-                    android:hint="请输入工号"
+                    android:hint="@string/str_input_card_no"
                     android:paddingLeft="@dimen/d26"
                     android:textSize="@dimen/font_size_18"
                     android:textStyle="bold"
-
                     />
 
-
-
             </LinearLayout>
 
             <LinearLayout
@@ -153,7 +150,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/d40"
-                    android:text="密码"
+                    android:text="@string/str_password"
                     android:textColor="@color/black"
                     android:textSize="@dimen/font_size_15"
                     android:textStyle="bold"
@@ -166,7 +163,7 @@
                     android:layout_marginLeft="@dimen/d8"
                     android:layout_marginRight="@dimen/d60"
                     android:background="@drawable/selector_nuser_ed_d"
-                    android:hint="请输入密码"
+                    android:hint="@string/input_password"
                     android:paddingLeft="@dimen/d26"
                     android:textSize="@dimen/font_size_18"
                     android:textStyle="bold" />
@@ -187,7 +184,7 @@
                 android:background="@drawable/selector_nuserlogin_btn"
                 android:gravity="center"
                 android:clickable="true"
-                android:text="进入医护"
+                android:text="@string/str_enter_medical_care"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_15" />
 
@@ -206,7 +203,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="请在旁边刷卡处刷NFC卡进入医护"
+                android:text="@string/str_swipe_nfc_card"
                 android:layout_marginLeft="@dimen/d20"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/black"
@@ -214,14 +211,14 @@
                 android:layout_marginTop="@dimen/d47"
                 />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="使用有效NFC刷卡成功后直接进入医护"
-                android:textSize="@dimen/font_size_10"
-                android:textColor="@color/black"
-                android:layout_marginTop="@dimen/d13"
-                />
+<!--            <TextView-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:text="使用有效NFC刷卡成功后直接进入医护"-->
+<!--                android:textSize="@dimen/font_size_10"-->
+<!--                android:textColor="@color/black"-->
+<!--                android:layout_marginTop="@dimen/d13"-->
+<!--                />-->
             <ImageView
                 android:layout_width="@dimen/d244"
                 android:layout_height="@dimen/d280"

callingdoor/src/main/res/layout/callingdoor_nurse_main.xml

@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d40"
                 android:layout_toRightOf="@+id/nurse_main_tx_1"
-                android:text="张舒婷护士"
+                android:text="--"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_26"
                 android:textStyle="bold" />
@@ -39,7 +39,7 @@
                 android:layout_below="@+id/nurse_main_tx_1"
                 android:layout_marginLeft="@dimen/d40"
                 android:layout_marginTop="@dimen/d8"
-                android:text="当前为您的个人医护板块"
+                android:text="@string/str_medical_care_area"
                 android:textColor="@color/text_black"
                 android:textSize="@dimen/font_size_18"
                 android:textStyle="bold" />
@@ -55,7 +55,7 @@
                 android:background="@drawable/selector_nuserlogin_btn"
                 android:clickable="true"
                 android:gravity="center"
-                android:text="退出医护"
+                android:text="@string/str_exit_medical_care"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_15" />
 
@@ -65,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/d40"
                 android:layout_marginTop="@dimen/d40"
-                android:text="您好，"
+                android:text="@string/str_welcome"
                 android:textColor="@color/txt_number"
                 android:textSize="@dimen/font_size_26"
                 android:textStyle="bold" />
@@ -103,7 +103,7 @@
                 android:id="@+id/nurse_top_1_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="定位"
+                android:text="@string/str_position"
                 android:textSize="@dimen/font_size_24"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -114,7 +114,7 @@
                 android:id="@+id/nurse_main_1_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="住院部402房"
+                android:text="---"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
                 android:layout_marginTop="@dimen/d10"
@@ -143,7 +143,7 @@
                 android:id="@+id/nurse_top_2_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="巡房"
+                android:text="@string/str_patrol"
                 android:textSize="@dimen/font_size_24"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -154,7 +154,7 @@
                 android:id="@+id/nurse_main_2_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="住院部402房"
+                android:text="---"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
                 android:layout_marginTop="@dimen/d10"
@@ -185,7 +185,7 @@
                 android:id="@+id/nurse_top_3_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="进入护理"
+                android:text="@string/enter_nursing"
                 android:textSize="@dimen/font_size_24"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -196,10 +196,10 @@
                 android:id="@+id/nurse_main_3_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="该房病床进入护理"
+                android:text="@string/set_huli_2"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
-                android:layout_marginTop="@dimen/d10"
+                android:padding="@dimen/d10"
                 />
         </LinearLayout>
         <LinearLayout
@@ -227,7 +227,7 @@
                 android:id="@+id/nurse_top_4_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="设置提示语"
+                android:text="@string/set_hint"
                 android:textSize="@dimen/font_size_24"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -238,10 +238,10 @@
                 android:id="@+id/nurse_main_4_tx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="锁屏显示"
+                android:padding="@dimen/d10"
+                android:text="@string/set_hint_2"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/text_name_color"
-                android:layout_marginTop="@dimen/d10"
                 />
         </LinearLayout>
     </RelativeLayout>

callingdoor/src/main/res/layout/callingdoor_nurse_msg.xml

@@ -22,14 +22,17 @@
                 <!--设备号-->
                 <LinearLayout
                     android:id="@+id/msg_view_title_layout_return"
-                    android:layout_width="@dimen/d105"
+                    android:layout_width="wrap_content"
                     android:layout_height="@dimen/d30"
                     android:layout_marginLeft="20dp"
                     android:background="@drawable/shape_main_hos_txt_bg"
                     android:clickable="true"
                     android:gravity="center"
                     android:layout_centerVertical="true"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:paddingLeft="@dimen/d10"
+                    android:paddingRight="@dimen/d10"
+                    >
 
                     <ImageView
                         android:id="@+id/msg_view_title_layout_img"
@@ -38,14 +41,15 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="6dp"
                         android:visibility="gone"
-                        android:background="@mipmap/return_w" />
+                        android:background="@mipmap/return_b" />
                     <!--医院名称-->
                     <TextView
                         android:id="@+id/msg_view_title_layout_tv_hospital_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="科室名称"
-                        android:textColor="@color/white"
+                        android:text=""
+                        android:singleLine="true"
+                        android:textColor="@color/delete_text_color"
                         android:textSize="@dimen/font_size_14" />
                 </LinearLayout>
                 <TextView
@@ -227,7 +231,7 @@
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
                      android:layout_toRightOf="@+id/nurse_msg_tx_1"
-                     android:text="自定义输入"
+                     android:text="@string/str_input_custom_info"
                      android:textSize="@dimen/font_size_18"
                      android:textColor="@color/black"
                      android:textStyle="bold"
@@ -239,7 +243,7 @@
                   android:id="@+id/nurse_msg_ed"
                   android:layout_width="match_parent"
                   android:layout_height="@dimen/d50"
-                  android:hint="请保持安静不要吵闹"
+                  android:hint="@string/str_be_quiet"
                   android:paddingLeft="@dimen/d26"
                   android:textSize="@dimen/font_size_18"
                   android:gravity="center_vertical"
@@ -288,7 +292,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@+id/nurse_msg_tx_3"
-                android:text="快捷提示语"
+                android:text="@string/str_hint_text"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -306,7 +310,7 @@
                     android:layout_width="@dimen/d250"
                     android:layout_height="@dimen/d48"
                     android:gravity="center"
-                    android:text="保持安静"
+                    android:text="@string/str_be_quiet"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d20"
@@ -319,7 +323,7 @@
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_5"
                     android:gravity="center"
-                    android:text="请勿大声喧哗"
+                    android:text="@string/str_no_noise"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d16"
@@ -332,7 +336,7 @@
                     android:layout_height="@dimen/d48"
                     android:layout_below="@+id/nurse_msg_tx_6"
                     android:gravity="center"
-                    android:text="正在如厕请勿进入"
+                    android:text="@string/str_no_entry"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d16"
@@ -345,7 +349,7 @@
                     android:layout_height="@dimen/d48"
                     android:layout_toRightOf="@+id/nurse_msg_tx_5"
                     android:gravity="center"
-                    android:text="正在护理请勿打扰"
+                    android:text="@string/str_no_disturb"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d20"
@@ -359,7 +363,7 @@
                     android:layout_below="@+id/nurse_msg_tx_5"
                     android:layout_toRightOf="@+id/nurse_msg_tx_6"
                     android:gravity="center"
-                    android:text="请勿探视"
+                    android:text="@string/str_no_visitation"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d16"
@@ -373,7 +377,7 @@
                     android:layout_below="@+id/nurse_msg_tx_6"
                     android:layout_toRightOf="@+id/nurse_msg_tx_7"
                     android:gravity="center"
-                    android:text="请不要过多人聚集"
+                    android:text="@string/str_no_gather"
                     android:textSize="@dimen/font_size_16"
                     android:textColor="@color/text_name_color"
                     android:layout_marginTop="@dimen/d16"
@@ -424,7 +428,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@+id/nurse_msg_tx_11"
-                android:text="设置提示时间"
+                android:text="@string/str_hint_time"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -437,7 +441,7 @@
                 android:layout_height="@dimen/d48"
                 android:layout_below="@+id/nurse_msg_tx_11"
                 android:gravity="center"
-                android:text="10分钟"
+                android:text="@string/time_10min"
                 android:textSize="@dimen/font_size_16"
                 android:textColor="@color/text_name_color"
                 android:layout_marginTop="@dimen/d20"
@@ -450,7 +454,7 @@
                 android:layout_height="@dimen/d48"
                 android:layout_below="@+id/nurse_msg_tx_13"
                 android:gravity="center"
-                android:text="30分钟"
+                android:text="@string/time_30min"
                 android:textSize="@dimen/font_size_16"
                 android:textColor="@color/text_name_color"
                 android:layout_marginTop="@dimen/d16"
@@ -463,7 +467,7 @@
                 android:layout_height="@dimen/d48"
                 android:layout_below="@+id/nurse_msg_tx_14"
                 android:gravity="center"
-                android:text="90分钟"
+                android:text="@string/time_90min"
                 android:textSize="@dimen/font_size_16"
                 android:textColor="@color/text_name_color"
                 android:layout_marginTop="@dimen/d16"
@@ -477,7 +481,7 @@
                 android:layout_below="@+id/nurse_msg_tx_11"
                 android:layout_toRightOf="@+id/nurse_msg_tx_13"
                 android:gravity="center"
-                android:text="15分钟"
+                android:text="@string/time_15min"
                 android:textSize="@dimen/font_size_16"
                 android:textColor="@color/text_name_color"
                 android:layout_marginTop="@dimen/d20"
@@ -491,7 +495,7 @@
                 android:layout_below="@+id/nurse_msg_tx_13"
                 android:layout_toRightOf="@+id/nurse_msg_tx_14"
                 android:gravity="center"
-                android:text="60分钟"
+                android:text="@string/time_60min"
                 android:textSize="@dimen/font_size_16"
                 android:textColor="@color/text_name_color"
                 android:layout_marginTop="@dimen/d16"
@@ -505,7 +509,7 @@
                 android:layout_below="@+id/nurse_msg_tx_14"
                 android:layout_toRightOf="@+id/nurse_msg_tx_15"
                 android:gravity="center"
-                android:text="120分钟"
+                android:text="@string/time_120min"
                 android:textSize="@dimen/font_size_16"
                 android:textColor="@color/text_name_color"
                 android:layout_marginTop="@dimen/d16"
@@ -522,7 +526,7 @@
             android:layout_height="@dimen/d60"
             android:layout_gravity="center"
             android:gravity="center"
-            android:text="开始提示"
+            android:text="@string/str_confirm"
             android:textColor="@color/white"
             android:background="@drawable/shape_main_hos_txt_bg"
             android:layout_marginTop="@dimen/d26"

callingdoor/src/main/res/layout/callingdoor_setting_main.xml

@@ -34,7 +34,7 @@
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
                      android:layout_toRightOf="@+id/settings_img"
-                     android:text="设备调试"
+                     android:text="@string/device_test"
                      android:textSize="@dimen/font_size_18"
                      android:layout_marginLeft="@dimen/d10"
                      android:textColor="@color/black"
@@ -71,7 +71,7 @@
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:layout_marginTop="@dimen/d12"
-                          android:text="服务器设置"
+                          android:text="@string/server_config"
                           android:textColor="@color/white"
                           android:textSize="@dimen/font_size_14"
                           android:textStyle="bold" />
@@ -83,7 +83,7 @@
                           android:layout_marginTop="@dimen/d21"
                           android:background="@drawable/shape_n_login_ed_bg"
                           android:gravity="center"
-                          android:text="立即设置"
+                          android:text="@string/str_start"
                           android:textColor="#3A78EF"
                           android:textSize="@dimen/font_size_10" />
                   </LinearLayout>
@@ -108,7 +108,7 @@
                       <TextView
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:text="网络设置"
+                          android:text="@string/str_network_config"
                           android:textSize="@dimen/font_size_14"
                           android:textColor="@color/white"
                           android:textStyle="bold"
@@ -119,7 +119,7 @@
                           android:id="@+id/settings_main_2_tx"
                           android:layout_width="@dimen/d58"
                           android:layout_height="@dimen/d20"
-                          android:text="立即设置"
+                          android:text="@string/str_start"
                           android:textSize="@dimen/font_size_10"
                           android:textColor="#57D64E"
                           android:gravity="center"
@@ -149,7 +149,7 @@
                       <TextView
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:text="通话设置"
+                          android:text="@string/device_config"
                           android:textSize="@dimen/font_size_14"
                           android:textColor="@color/white"
                           android:textStyle="bold"
@@ -160,7 +160,7 @@
                           android:id="@+id/settings_main_top_3_tx"
                           android:layout_width="@dimen/d58"
                           android:layout_height="@dimen/d20"
-                          android:text="立即设置"
+                          android:text="@string/str_start"
                           android:textSize="@dimen/font_size_10"
                           android:textColor="@color/main_color"
                           android:gravity="center"
@@ -191,7 +191,7 @@
                       <TextView
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:text="进入调试"
+                          android:text="@string/test_mode"
                           android:textSize="@dimen/font_size_14"
                           android:textColor="@color/white"
                           android:textStyle="bold"
@@ -202,7 +202,7 @@
                           android:id="@+id/settings_main_3_tx"
                           android:layout_width="@dimen/d58"
                           android:layout_height="@dimen/d20"
-                          android:text="开始调试"
+                          android:text="@string/str_start"
                           android:textSize="@dimen/font_size_10"
                           android:textColor="#FF924A"
                           android:gravity="center"
@@ -233,7 +233,7 @@
                       <TextView
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:text="版本更新"
+                          android:text="@string/str_app_update"
                           android:textSize="@dimen/font_size_14"
                           android:textColor="@color/white"
                           android:textStyle="bold"
@@ -244,7 +244,7 @@
                           android:id="@+id/settings_main_4_tx"
                           android:layout_width="@dimen/d58"
                           android:layout_height="@dimen/d20"
-                          android:text="更新版本"
+                          android:text="@string/str_start"
                           android:textSize="@dimen/font_size_10"
                           android:textColor="#EE3B3B"
                           android:gravity="center"
@@ -275,7 +275,7 @@
                       <TextView
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:text="重启设备"
+                          android:text="@string/reboot_device"
                           android:textSize="@dimen/font_size_14"
                           android:textColor="@color/white"
                           android:textStyle="bold"
@@ -286,7 +286,7 @@
                           android:id="@+id/settings_main_5_tx"
                           android:layout_width="@dimen/d58"
                           android:layout_height="@dimen/d20"
-                          android:text="立即重启"
+                          android:text="@string/str_start"
                           android:textSize="@dimen/font_size_10"
                           android:textColor="#FF924A"
                           android:gravity="center"
@@ -325,7 +325,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@+id/settings_img1"
-                android:text="设备信息"
+                android:text="@string/str_device_info"
                 android:textSize="@dimen/font_size_18"
                 android:textColor="@color/black"
                 android:textStyle="bold"
@@ -410,7 +410,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="网关"
+                    android:text="@string/str_gateway"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -474,7 +474,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="服务器ID"
+                    android:text="@string/str_server_ip"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -507,7 +507,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="语音ID"
+                    android:text="SIP ID:"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -538,7 +538,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="语音类型"
+                    android:text="@string/voice_type"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -550,7 +550,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
 
-                    android:text="000类型"
+                    android:text="000"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14" />
             </LinearLayout>
@@ -570,7 +570,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="语音服务器"
+                    android:text="SIP server:"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -581,7 +581,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="服务器"
+                    android:text="--"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14" />
             </LinearLayout>
@@ -601,7 +601,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="APP版本"
+                    android:text="APP version"
+
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -634,7 +635,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
-                    android:text="发布日期"
+                    android:text="@string/str_app_release_date"
                     android:textColor="@color/txt_setting"
                     android:textSize="@dimen/font_size_14"
                     android:layout_marginLeft="@dimen/d12"
@@ -666,7 +667,7 @@
                 android:id="@+id/settings_img2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="扫描二维码"
+                android:text="@string/str_device_qr"
                 android:drawableLeft="@mipmap/saom"
                 android:drawablePadding="@dimen/d8"
                 android:textSize="@dimen/font_size_18"

callingdoor/src/main/res/layout/callingdoor_test_main.xml

@@ -41,25 +41,26 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
-                android:text="请输入目标SIP账号"
+                android:text="@string/test_target_sip_account"
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:textSize="@dimen/font_size_18"
                 android:gravity="center" />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/d7"
-                android:text="输入账号进行测试"
-                android:textColor="#7D7D7D"
-                android:textSize="@dimen/font_size_13"
-                android:gravity="center" />
+<!--            <TextView-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginTop="@dimen/d7"-->
+<!--                android:text="输入账号进行测试"-->
+<!--                android:visibility="gone"-->
+<!--                android:textColor="#7D7D7D"-->
+<!--                android:textSize="@dimen/font_size_13"-->
+<!--                android:gravity="center" />-->
 
             <EditText
                 android:id="@+id/password_ed"
                 android:layout_width="@dimen/d383"
                 android:layout_height="@dimen/d52"
-                android:hint="请输入账号"
+                android:hint="@string/test_hint_sip_account"
                 android:paddingLeft="@dimen/d26"
                 android:textSize="@dimen/font_size_18"
                 android:gravity="center_vertical"
@@ -74,10 +75,9 @@
                 android:layout_height="@dimen/d48"
                 android:gravity="center"
                 android:background="@drawable/shape_main_hos_txt_bg"
-                android:text="呼叫测试"
                 android:textSize="16sp"
                 android:layout_marginTop="@dimen/d20"
-
+                android:text="@string/test_sip_call"
                 android:textColor="@drawable/selector_bottom_btn_text_color"/>
 
 
@@ -98,8 +98,8 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="66dp"
-                android:text="外接设备测试"
+                android:layout_marginTop="46dp"
+                android:text="@string/test_peripheral"
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:textSize="@dimen/font_size_18"
@@ -108,7 +108,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d7"
-                android:text="请检查外接设备是否已连接再开始测试"
+                android:text="@string/test_peripheral_connect_check"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_13"
                 android:gravity="center" />
@@ -126,7 +126,7 @@
                     android:layout_height="@dimen/d48"
                     android:gravity="center"
                     android:background="@drawable/shape_main_hos_txt_bg"
-                    android:text="手柄按键测试"
+                    android:text="@string/test_handle_call_button"
                     android:textSize="16sp"
 
                     android:textColor="@drawable/selector_bottom_btn_text_color"/>
@@ -152,7 +152,7 @@
                     android:layout_height="@dimen/d48"
                     android:gravity="center"
                     android:background="@drawable/shape_main_hos_txt_bg"
-                    android:text="面板呼叫测试"
+                    android:text="@string/test_device_call_button"
                     android:textSize="16sp"
 
                     android:textColor="@drawable/selector_bottom_btn_text_color"/>
@@ -178,7 +178,7 @@
                     android:layout_height="@dimen/d48"
                     android:gravity="center"
                     android:background="@drawable/shape_main_hos_txt_bg"
-                    android:text="面板呼叫测试"
+                    android:text="@string/test_device_cancel_button"
                     android:textSize="16sp"
 
                     android:textColor="@drawable/selector_bottom_btn_text_color"/>
@@ -191,7 +191,32 @@
                     android:layout_marginLeft="@dimen/d8"
                     />
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/text_ll_5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d16"
+                android:gravity="center"
+                android:orientation="horizontal">
 
+                <Button
+                    android:id="@+id/sos_button"
+                    android:layout_width="@dimen/d383"
+                    android:layout_height="@dimen/d48"
+                    android:background="@drawable/shape_main_hos_txt_bg"
+                    android:gravity="center"
+                    android:text="@string/test_sos_button"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="16sp" />
+
+                <ImageView
+                    android:id="@+id/sos_img"
+                    android:layout_width="@dimen/d16"
+                    android:layout_height="@dimen/d16"
+                    android:layout_marginLeft="@dimen/d8"
+                    android:background="@mipmap/gou"
+                    android:visibility="invisible" />
+            </LinearLayout>
             <LinearLayout
 
                 android:layout_width="match_parent"
@@ -208,7 +233,7 @@
                     android:gravity="center_vertical"
                     android:background="@drawable/shape_main_hos_txt_bg"
                     android:drawableLeft="@mipmap/lu"
-                    android:text="录音测试（按住按钮说话10s）"
+                    android:text="@string/test_mic_record"
                     android:textSize="16sp"
                     android:paddingLeft="@dimen/d88"
                     android:drawablePadding="@dimen/d16"

callingdoor/src/main/res/layout/item_bed.xml

@@ -42,11 +42,16 @@
                 android:textSize="18sp"/>
         </LinearLayout>
 
-        <TextView
+        <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_toRightOf="@+id/ll_bed"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="-1"
+            android:singleLine="true"
             android:text="张小斐"
             android:layout_marginLeft="@dimen/d18"
             android:layout_marginTop="@dimen/d20"

callingdoor/src/main/res/layout/main_network_dialog.xml

@@ -23,7 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="23dp"
-        android:text="选择您要设置的网络类型"
+        android:text="@string/check_network_type"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"
@@ -44,7 +44,7 @@
         android:layout_height="@dimen/d48"
         android:layout_marginTop="@dimen/d20"
         android:background="@drawable/selector_nuser_msg_tx_d"
-        android:text="静态"
+        android:text="STATIC"
         android:textColor="@drawable/selector_network_tx_color"
         android:textSize="@dimen/font_size_16"
         android:gravity="center" />
@@ -55,7 +55,7 @@
         android:layout_height="@dimen/d48"
         android:gravity="center"
         android:background="@drawable/shape_main_hos_txt_bg"
-        android:text="确定"
+        android:text="@string/str_confirm"
         android:textSize="16sp"
         android:layout_marginTop="@dimen/d30"
         android:layout_marginBottom="@dimen/d40"

callingdoor/src/main/res/layout/main_network_two_dialog.xml

@@ -18,101 +18,97 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="23dp"
             android:gravity="center"
-            android:text="请设置静态网络"
+            android:text="@string/str_set_network_info"
             android:textColor="@color/black"
             android:textSize="@dimen/font_size_18"
             android:textStyle="bold" />
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="@dimen/d383"
             android:layout_height="@dimen/d52"
             android:layout_marginTop="@dimen/d24"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+           >
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="IP地址"
+                android:text="@string/str_ip"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_18"
+                android:layout_centerVertical="true"
                 android:textStyle="bold" />
 
             <EditText
                 android:id="@+id/network2_ip"
-                android:layout_width="match_parent"
+                android:layout_width="@dimen/d250"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/d20"
                 android:background="@drawable/selector_nuser_ed_d"
-                android:hint="请输入IP地址"
-                android:paddingLeft="@dimen/d30"
+                android:layout_alignParentRight="true"
+                android:gravity="center"
                 android:textSize="@dimen/font_size_18"
                 android:textStyle="bold" />
 
-        </LinearLayout>
+        </RelativeLayout>
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="@dimen/d383"
             android:layout_height="@dimen/d52"
             android:layout_marginTop="@dimen/d10"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+         >
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="网关"
+                android:text="@string/str_gateway"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_18"
+                android:layout_centerVertical="true"
                 android:textStyle="bold" />
 
             <EditText
                 android:id="@+id/network2_wg"
-                android:layout_width="match_parent"
+                android:layout_width="@dimen/d250"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/d35"
+                android:layout_alignParentRight="true"
+                android:gravity="center"
                 android:background="@drawable/selector_nuser_ed_d"
-                android:hint="请输入网关"
-                android:paddingLeft="@dimen/d30"
                 android:textSize="@dimen/font_size_18"
                 android:textStyle="bold" />
 
-        </LinearLayout>
+        </RelativeLayout>
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="@dimen/d383"
             android:layout_height="@dimen/d52"
             android:layout_marginTop="@dimen/d10"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+          >
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="掩码"
+                android:text="@string/str_netmask"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_18"
+                android:layout_centerVertical="true"
                 android:textStyle="bold" />
 
             <EditText
                 android:id="@+id/network2_ym"
-                android:layout_width="match_parent"
+                android:layout_width="@dimen/d250"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/d35"
+                android:layout_alignParentRight="true"
                 android:background="@drawable/selector_nuser_ed_d"
-                android:hint="请输入掩码"
-                android:paddingLeft="@dimen/d30"
+                android:gravity="center"
                 android:textSize="@dimen/font_size_18"
                 android:textStyle="bold" />
 
-        </LinearLayout>
+        </RelativeLayout>
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="@dimen/d383"
             android:layout_height="@dimen/d52"
             android:layout_marginTop="@dimen/d10"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+           >
 
             <TextView
                 android:layout_width="wrap_content"
@@ -124,16 +120,15 @@
 
             <EditText
                 android:id="@+id/network2_dns"
-                android:layout_width="match_parent"
+                android:layout_width="@dimen/d250"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/d35"
+                android:layout_alignParentRight="true"
+                android:gravity="center"
                 android:background="@drawable/selector_nuser_ed_d"
-                android:hint="请输入DNS"
-                android:paddingLeft="@dimen/d30"
                 android:textSize="@dimen/font_size_18"
                 android:textStyle="bold" />
 
-        </LinearLayout>
+        </RelativeLayout>
 
         <LinearLayout
             android:layout_width="@dimen/d383"
@@ -149,7 +144,7 @@
                 android:layout_height="@dimen/d48"
                 android:background="@drawable/shape_password_bt_bg"
                 android:gravity="center"
-                android:text="关闭"
+                android:text="@string/str_cancel"
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="16sp" />
 
@@ -160,7 +155,7 @@
                 android:layout_marginLeft="@dimen/d31"
                 android:background="@drawable/shape_main_hos_txt_bg"
                 android:gravity="center"
-                android:text="确定"
+                android:text="@string/str_confirm"
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="16sp" />
         </LinearLayout>

callingdoor/src/main/res/layout/main_password_dialog.xml

@@ -25,19 +25,19 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:gravity="center"
-            android:text="请输入管理员密码"
+            android:text="@string/input_password"
             android:textColor="@color/black"
             android:textSize="@dimen/font_size_18"
             android:textStyle="bold" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/d7"
-            android:gravity="center"
-            android:text="查看设备信息需管理权限"
-            android:textColor="#7D7D7D"
-            android:textSize="@dimen/font_size_18" />
+<!--        <TextView-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="@dimen/d7"-->
+<!--            android:gravity="center"-->
+<!--            android:text="查看设备信息需管理权限"-->
+<!--            android:textColor="#7D7D7D"-->
+<!--            android:textSize="@dimen/font_size_18" />-->
 
         <EditText
             android:id="@+id/password_ed"
@@ -47,7 +47,6 @@
             android:layout_marginTop="@dimen/d16"
             android:background="@drawable/shape_n_login_ed_bg2"
             android:gravity="center_vertical"
-            android:hint="请输入管理密码"
             android:paddingLeft="@dimen/d26"
             android:textSize="@dimen/font_size_18"
             android:textStyle="bold" />
@@ -66,7 +65,7 @@
                 android:layout_height="@dimen/d48"
                 android:background="@drawable/shape_password_bt_bg"
                 android:gravity="center"
-                android:text="关闭"
+                android:text="@string/str_cancel"
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="16sp" />
 
@@ -77,7 +76,7 @@
                 android:layout_marginLeft="@dimen/d31"
                 android:background="@drawable/shape_main_hos_txt_bg"
                 android:gravity="center"
-                android:text="确定"
+                android:text="@string/str_confirm"
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="16sp" />
         </LinearLayout>

callingdoor/src/main/res/layout/main_reinforcements_dialog.xml

@@ -25,7 +25,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:text="增援已发出，请耐心等待回应"
+            android:text="@string/reinforce_sent"
             android:textColor="@color/black"
             android:textStyle="bold"
             android:textSize="@dimen/font_size_18"

callingdoor/src/main/res/layout/main_restart_dialog.xml

@@ -23,19 +23,19 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="确认重启该设备？"
+        android:text="@string/str_reboot_check"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"
         android:gravity="center" />
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/d7"
-        android:text="点击确认后设备开始重启"
-        android:textColor="#7D7D7D"
-        android:textSize="@dimen/font_size_18"
-        android:gravity="center" />
+<!--    <TextView-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginTop="@dimen/d7"-->
+<!--        android:text="点击确认后设备开始重启"-->
+<!--        android:textColor="#7D7D7D"-->
+<!--        android:textSize="@dimen/font_size_18"-->
+<!--        android:gravity="center" />-->
 
 
     <LinearLayout
@@ -51,7 +51,7 @@
             android:layout_height="@dimen/d48"
             android:gravity="center"
             android:background="@drawable/shape_password_bt_bg"
-            android:text="取消"
+            android:text="@string/str_cancel"
             android:textSize="16sp"
 
             android:textColor="@drawable/selector_bottom_btn_text_color"/>
@@ -62,7 +62,7 @@
             android:layout_height="@dimen/d48"
             android:gravity="center"
             android:background="@drawable/shape_main_hos_txt_bg"
-            android:text="确定"
+            android:text="@string/str_confirm"
             android:textSize="16sp"
             android:layout_marginLeft="@dimen/d31"
             android:textColor="@drawable/selector_bottom_btn_text_color"/>

callingdoor/src/main/res/layout/main_server_dialog.xml

@@ -25,19 +25,19 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:gravity="center"
-            android:text="请设置服务器地址"
+            android:text="@string/str_server_ip_setting"
             android:textColor="@color/black"
             android:textSize="@dimen/font_size_18"
             android:textStyle="bold" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/d6"
-            android:gravity="center"
-            android:text="只可输入数字和小数点"
-            android:textColor="#7D7D7D"
-            android:textSize="@dimen/font_size_18" />
+<!--        <TextView-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="@dimen/d6"-->
+<!--            android:gravity="center"-->
+<!--            android:text="只可输入数字和小数点"-->
+<!--            android:textColor="#7D7D7D"-->
+<!--            android:textSize="@dimen/font_size_18" />-->
 
         <EditText
             android:id="@+id/server_ed"
@@ -48,7 +48,7 @@
             android:background="@drawable/shape_n_login_ed_bg2"
             android:digits="1234567890."
             android:gravity="center_vertical"
-            android:hint="请输入服务器地址"
+            android:hint="@string/str_server_ip_tips"
             android:paddingLeft="@dimen/d26"
             android:textSize="@dimen/font_size_18"
             android:textStyle="bold" />
@@ -68,7 +68,7 @@
                 android:layout_height="@dimen/d48"
                 android:background="@drawable/shape_main_hos_txt_bg"
                 android:gravity="center"
-                android:text="确定"
+                android:text="@string/str_confirm"
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="16sp" />
 
@@ -79,7 +79,7 @@
                 android:layout_marginLeft="@dimen/d31"
                 android:background="@drawable/shape_main_hos_txt_bg"
                 android:gravity="center"
-                android:text="重置"
+                android:text="@string/str_reset"
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="16sp" />
         </LinearLayout>

callingdoor/src/main/res/layout/main_version_dialog.xml

@@ -21,7 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="23dp"
-        android:text="当前设备版本号"
+        android:text="@string/version_title"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"
@@ -39,7 +39,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/d12"
-        android:text="发布日期"
+        android:text="@string/str_app_release_date"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"
@@ -60,7 +60,7 @@
         android:layout_marginBottom="@dimen/d67"
         android:gravity="center"
         android:background="@drawable/shape_main_hos_txt_bg"
-        android:text="检测更新"
+        android:text="@string/check_update"
         android:textSize="16sp"
         android:layout_marginTop="@dimen/d35"
         android:textColor="@drawable/selector_bottom_btn_text_color"/>

callingdoor/src/main/res/layout/nurse_exit_huli_dialog.xml

@@ -22,7 +22,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="确认退出医护模块？"
+        android:text="@string/str_exit_medical_care_tips"
         android:textColor="#7D7D7D"
         android:textSize="@dimen/font_size_18"
         android:gravity="center" />
@@ -34,7 +34,7 @@
         android:layout_marginBottom="@dimen/d35"
         android:gravity="center"
         android:background="@drawable/shape_huli_dialog_bt_bg"
-        android:text="退出医护"
+        android:text="@string/str_exit_medical_care"
         android:textSize="16sp"
         android:textColor="@drawable/selector_bottom_btn_text_color"/>
 

callingdoor/src/main/res/layout/nurse_huli_dialog.xml

@@ -17,17 +17,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="102床、103床、104床、105床"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"
+        android:visibility="gone"
         android:gravity="center" />
     <TextView
         android:id="@+id/hili_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="以上病床护理中，确认退出？"
+
         android:textColor="#7D7D7D"
         android:textSize="@dimen/font_size_18"
         android:gravity="center" />
@@ -39,7 +39,7 @@
         android:layout_marginBottom="@dimen/d35"
         android:gravity="center"
         android:background="@drawable/shape_huli_dialog_bt_bg"
-        android:text="进入护理"
+        android:text="@string/enter_nursing"
         android:textSize="16sp"
         android:textColor="@drawable/selector_bottom_btn_text_color"/>
 

callingdoor/src/main/res/layout/nurse_patrol_dialog.xml

@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="已巡房：住院部205房"
+        android:text="@string/str_patrol"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"

callingdoor/src/main/res/layout/nurse_positioning_dialog.xml

@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="已定位当前位置：住院部"
+        android:text="@string/str_positioned"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:textSize="@dimen/font_size_18"

callingdoor/src/main/res/values/strings.xml

@@ -4,5 +4,5 @@
     <string name="target_sip">4000348830</string>
     <string name="bed_nurse_name">护理项目</string>
     <string name="wdkl_app_name">Doorway</string>
-    <string name="baby_bg_txt">坐个好<font color='#F8EDC7'>月子</font>幸福一辈子</string>
+
 </resources>

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/channel/YhUtil.java

@@ -110,7 +110,7 @@ public class YhUtil {
         TcpClient.getInstance().sendMsg(tcpModel.toJson());
     }
 
-    public static void sendReinforceResponsed(Integer fromId,   int id) {
+    public static void sendReinforceResponsed(Integer fromId, int id) {
         TcpModel tcpModel = ExitLanding(fromId,  id);
         TcpClient.getInstance().sendMsg(tcpModel.toJson());
     }

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

@@ -10,6 +10,8 @@
     <string name="colleague">Colegas</string>
     <string name="group_message">Mensaje grupal</string>
     <string name="reconnect">Reconectar</string>
+    <string name="empty_bed">Cama vacía</string>
+    <string name="empty">nulo</string>
 
     <string name="default_nurse_config_name">Elemento de enfermera</string>
     <string name="str_empty">NULO</string>
@@ -90,16 +92,16 @@
     <string name="str_support">Reforzar</string>
     <string name="str_supports">Reforzar</string>
     <string name="str_call">Llamar</string>
-    <string name="str_cancel_call">Cancelar llamada</string>
-    <string name="str_call_nurse">Llamada a enfermera</string>
-    <string name="str_call_bed">Llamar a cama</string>
+    <string name="str_cancel_call">Cancelar</string>
+    <string name="str_call_nurse">enfermera</string>
+    <string name="str_call_bed">cama</string>
 
     <string name="doctor_title">Doctor</string>
     <string name="nurse_title">Enfermera</string>
     <string name="empty_title">buena salud</string>
     <string name="reboot_device">Reiniciar</string>
     <string name="check_update">Verificar actualización</string>
-    <string name="server_config">Configuración del servidor</string>
+    <string name="server_config">Configuración servidor</string>
     <string name="product_desc">Producto:</string>
     <string name="device_error">Error del dispositivo, ¡reinicie!</string>
 
@@ -278,7 +280,7 @@
     <string name="power_reset">Reinicio de energía</string>
     <string name="screen_off">Pantalla apagada</string>
     <string name="call_config">Configuración de llamada</string>
-    <string name="device_config">Configuración del dispositivo</string>
+    <string name="device_config">Configuración</string>
     <string name="device_linkage">Equipo asociado</string>
 
     <string name="str_activated">Activado</string>
@@ -394,6 +396,7 @@
     <string name="reinforce_sent3">La información de la alarma de humo ha sido enviada</string>
     <string name="reinforce_sent4">La información de la alarma infrarroja ha sido enviada</string>
     <string name="reinforce_respond">Reforzar respuesta</string>
+    <string name="reinforce_respond_2">Su solicitud ha sido respondida, por favor espere</string>
     <string name="str_server_ip_empty">¡La IP del servidor está vacía!</string>
 
     <string name="str_positioned">Posicionado</string>
@@ -503,8 +506,8 @@
     <string name="str_server_ip_tips">Solo admite número y punto.</string>
 
     <string name="str_age">"Edad: "</string>
-    <string name="str_gender_male">Género: masculino</string>
-    <string name="str_gender_female">Género: femenino</string>
+    <string name="str_gender_male">Género:masculino</string>
+    <string name="str_gender_female">Género:femenino</string>
     <string name="str_gender_none">"Género: "</string>
     <string name="str_tips">Consejos</string>
     <string name="str_nurse_station">Estación de enfermería</string>
@@ -585,5 +588,21 @@
     <string name="act_message_4">Active después de configurar los parámetros a la derecha</string>
     <string name="act_message_5">Por favor, reinicie el dispositivo y actívelo nuevamente</string>
 
+    <string name="door_mom_main_1">"Fecha de entrada:"</string>
+    <string name="door_mom_main_2">"Fecha de salida:"</string>
+    <string name="door_mom_title_1">Información de la Mamá</string>
+    <string name="door_mom_title_2">Nombre de la Mamá</string>
+    <string name="door_mom_title_3">Edad de la Mamá</string>
+    <string name="door_mom_title_4">Información del Bebé</string>
+    <string name="door_mom_title_5">Nombre del Bebé</string>
+    <string name="door_mom_title_6">Género del Bebé</string>
+    <string name="baby_bg_txt">"Tener un buen <font color='#F8EDC7'>confinamiento</font> y felicidad para toda la vida"</string>
+
+    <string name="door_hos_title_1">Ocupación</string>
+    <string name="door_hos_title_2">Camas libres</string>
+    <string name="door_hos_title_3">Número de cama</string>
+    <string name="set_hint_2">Mostrar en la Pantalla de Bloqueo</string>
+    <string name="set_huli_2">Entrar en Cuidados para esta Cama</string>
+
 
 </resources>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="data_empty">Empty</string>
+    <string name="data_empty">Пустой</string>
     <string name="register_server_ip">IP-адрес сервера:</string>
     <string name="register_device_identifier">Идентификатор:</string>
     <string name="register_done">Регистрация завершена</string>
@@ -43,7 +43,7 @@
     <string name="str_call_speaker">Динамик</string>
     <string name="voice_call_speech">%s вызов</string>
     <string name="sos_call_speech">экстренный вызов %s</string>
-    <string name="card_no">"Card No: "</string>
+    <string name="card_no">"Номер карты: "</string>
     <string name="indate">"Дата: "</string>
     <string name="card_no_gy">"Номер пользователя: "</string>
     <string name="indate_gy">"Дата регистрации: "</string>
@@ -72,16 +72,16 @@
     <string name="welcome_txt_1">Желаю вам скорейшего выздоровления</string>
     <string name="welcome_txt_2">Вера в то, что плохое всегда будет позади, и что хорошее грядет</string>
 
-    <string name="str_medical_care">Медицинское обслуживание населения</string>
+    <string name="str_medical_care">Забота</string>
     <string name="str_supports">Reforzar</string>
     <string name="str_home">Главная</string>
     <string name="str_fees">Оплата</string>
     <string name="str_more">Еще</string>
     <string name="str_support">Усилить</string>
     <string name="str_call">Позвонить</string>
-    <string name="str_cancel_call">Отменить звонок</string>
-    <string name="str_call_nurse">Вызвать медсестру</string>
-    <string name="str_call_bed">Вызов кровати</string>
+    <string name="str_cancel_call">Отмена</string>
+    <string name="str_call_nurse">Медсестра</string>
+    <string name="str_call_bed">кровать</string>
     <string name="doctor_title">Врач</string>
     <string name="nurse_title">Медсестра</string>
     <string name="empty_title">доброго здоровья</string>
@@ -179,331 +179,334 @@
     <string name="str_all_call">Все</string>
     <string name="str_other_call">Другие</string>
     <string name="str_interaction_record">Интерактивная запись</string>
-    <string name="advice_long_term">Long term</string>
-    <string name="advice_temp">Temp</string>
-    <string name="advice_unknown">Unknown</string>
-    <string name="advice_status_valid">Valid</string>
-    <string name="advice_status_invalid">Invalid</string>
-    <string name="advice_start_time">"Start time: "</string>
-    <string name="advice_end_time">"End time: "</string>
-    <string name="advice_content">Content</string>
-    <string name="advice_detail">Detail</string>
-    <string name="sync_timezone">Sync Timezone</string>
+    <string name="advice_long_term">длинный</string>
+    <string name="advice_temp">временный</string>
+    <string name="advice_unknown">неизвестный</string>
+    <string name="advice_status_valid">эффективный</string>
+    <string name="advice_status_invalid">Неверный</string>
+    <string name="advice_start_time">"Время начала: "</string>
+    <string name="advice_end_time">"Время окончания: "</string>
+    <string name="advice_content">содержание</string>
+    <string name="advice_detail">параметр</string>
+    <string name="sync_timezone">Синхронизировать часовой пояс</string>
     <string name="click_twice_to_back">Нажмите Выйти еще раз</string>
-    <string name="voice_call_busy">Call busy…</string>
+    <string name="voice_call_busy">Звоню сейчас...</string>
 
-    <string name="plugin_update_tips">plugin service updating, please restart app later</string>
-    <string name="plugin_start_failed">start plugin service failed:</string>
-    <string name="plugin_start_success">plugin service started</string>
-    <string name="plugin_start_error">plugin service start failed, please restart app</string>
+    <string name="plugin_update_tips">Служба обновления приложения устанавливается. Перезапустите устройство позже, чтобы завершить запуск службы обновления.</string>
+    <string name="plugin_start_failed">Не удалось запустить службу плагина:</string>
+    <string name="plugin_start_success">Служба плагина запущена</string>
+    <string name="plugin_start_error">Не удалось запустить службу плагина, пожалуйста, перезагрузите приложение</string>
 
-    <string name="bluetooth_connect_failed">Bluetooth connect fail</string>
-    <string name="bluetooth_connect_success">Bluetooth connect success</string>
+    <string name="bluetooth_connect_failed">Соединение по Bluetooth не удалось</string>
+    <string name="bluetooth_connect_success">Соединение по Bluetooth успешно</string>
 
     <string name="str_about">Около</string>
     <string name="your_card_number">Номер вашей карты:</string>
     <string name="str_back">Назад</string>
 
-    <string name="str_start_check">Start</string>
-    <string name="str_start_detection">Start check…</string>
+    <string name="str_start_check">Начать</string>
+    <string name="str_start_detection">Начать проверку…</string>
 
     <!--移动-->
-    <string name="contact_update_title">Update contact</string>
-    <string name="phone_number_title">Phone number</string>
-    <string name="device_number_update_success">Update success!</string>
-    <string name="device_number_update_failed">Update failed!</string>
-    <string name="device_number_update_empty">Empty number!</string>
-    <string name="grant_write_permission">Please grant permissions!</string>
-    <string name="send_sms_number_empty">Empty SMS command!</string>
-    <string name="phone_number_check_tips">Please check phone number, if not correct, you need modify it.</string>
-    <string name="check_my_phone_number">Check phone number</string>
-    <string name="operator_number">Operator number:</string>
-    <string name="check_sms_command">SMS command:</string>
-    <string name="str_send">Send</string>
-    <string name="speech_sample_text">This is a text-to-speech sample</string>
-    <string name="voice_type">Call mode:</string>
-    <string name="str_call_transfer_title">Call forward:</string>
-    <string name="str_language_settings">Language settings</string>
-
-    <string name="network_connect">Network connect</string>
-    <string name="network_disconnect">Network disconnect</string>
+    <string name="contact_update_title">Обновление контакта</string>
+    <string name="phone_number_title">Номер телефона</string>
+    <string name="device_number_update_success">Обновление успешно!</string>
+    <string name="device_number_update_failed">Обновление не удалось!</string>
+    <string name="device_number_update_empty">Пустой номер!</string>
+    <string name="grant_write_permission">Пожалуйста, предоставьте разрешения!</string>
+    <string name="send_sms_number_empty">Пустая команда SMS!</string>
+    <string name="phone_number_check_tips">Пожалуйста, проверьте номер телефона, если он неверный, вам нужно изменить его.</string>
+    <string name="check_my_phone_number">Проверить номер телефона</string>
+    <string name="operator_number">Номер оператора:</string>
+    <string name="check_sms_command">Команда SMS:</string>
+    <string name="str_send">Отправить</string>
+    <string name="speech_sample_text">Это пример преобразования текста в речь</string>
+    <string name="voice_type">Режим вызова:</string>
+    <string name="str_call_transfer_title">Перевод вызова:</string>
+    <string name="str_language_settings">Настройки языка</string>
+
+    <string name="network_connect">Соединение с сетью</string>
+    <string name="network_disconnect">Разъединение с сетью</string>
 
     <!--视频通话-->
-    <string name="av_waiting">Wait for accept.</string>
-    <string name="av_audio_invite">Voice call invite</string>
-    <string name="av_video_invite">Video call invite</string>
-
-    <string name="contact_start_load">Start load contact</string>
-    <string name="contact_start_update">Start update, wait a moment.</string>
-    <string name="device_not_registered">Device not registered</string>
-    <string name="contact_load_count">Load contact count: %d</string>
-    <string name="contact_list_item">Contact name: %s, number: %s</string>
-    <string name="contact_updating">Updating</string>
-    <string name="contact_update_complete">Update complete:</string>
-    <string name="contact_update_porgress">Update progress:</string>
-    <string name="contact_add">Add contact:</string>
-    <string name="contact_duplication">Duplicate contact:</string>
-    <string name="contact_number_empty">Empty contact number</string>
-    <string name="contact_delete_complete">Delete contact complete.</string>
-
-    <string name="str_service">SERVICE</string>
+    <string name="av_waiting">Ожидание принятия.</string>
+    <string name="av_audio_invite">Приглашение к голосовому вызову</string>
+    <string name="av_video_invite">Приглашение к видео вызову</string>
+
+    <string name="contact_start_load">Начало загрузки контактов</string>
+    <string name="contact_start_update">Начало обновления, подождите немного.</string>
+    <string name="device_not_registered">Устройство не зарегистрировано</string>
+    <string name="contact_load_count">Количество загруженных контактов: %d</string>
+    <string name="contact_list_item">Имя контакта: %s, номер: %s</string>
+    <string name="contact_updating">Обновление</string>
+    <string name="contact_update_complete">Обновление завершено:</string>
+    <string name="contact_update_porgress">Прогресс обновления:</string>
+    <string name="contact_add">Добавить контакт:</string>
+    <string name="contact_duplication">Дублировать контакт:</string>
+    <string name="contact_number_empty">Пустой номер контакта</string>
+    <string name="contact_delete_complete">Удаление контакта завершено.</string>
+
+    <string name="str_service">СЕРВИС</string>
     <string name="str_male">мужчина</string>
     <string name="str_female">женщина</string>
-    <string name="fee_price">"Price: "</string>
-    <string name="fee_type">"Type: "</string>
-    <string name="cost_detail">"Detail: "</string>
-    <string name="str_first_page">First page!</string>
-    <string name="str_last_page">Last page!</string>
+    <string name="fee_price">"Цена: "</string>
+    <string name="fee_type">"Тип: "</string>
+    <string name="cost_detail">"Деталь: "</string>
+    <string name="str_first_page">Первая страница!</string>
+    <string name="str_last_page">Последняя страница!</string>
     <string name="str_advice">СоветСовет</string>
     <string name="str_blue_code">Blue Code</string>
     <string name="str_sign_in">Войти в систему</string>
-    <string name="str_sign_success">Sign in success</string>
-    <string name="str_sign_fail">Sign in failed</string>
+    <string name="str_sign_success">Войти успешно</string>
+    <string name="str_sign_fail">Ошибка входа</string>
 
-    <string name="power_reset">Power reset</string>
-    <string name="screen_off">Screen off</string>
+    <string name="power_reset">Сброс питания</string>
+    <string name="screen_off">Отключения экранаf</string>
     <string name="call_config">Параметры вызова</string>
-    <string name="device_config">Configuración del dispositivo</string>
+    <string name="device_config">Конфигурация системы</string>
     <string name="device_linkage">Соединительное оборудованиеe</string>
 
-    <string name="str_activated">Activated</string>
-    <string name="str_check_activation">Please register device.</string>
-    <string name="str_set_active_param">According to the parameters for register.</string>
-    <string name="str_reboot_active">Please reboot for complete active.</string>
-    <string name="connect_server_failed">Connect server failed.</string>
-    <string name="connect_check">Please check network or server.</string>
-    <string name="str_data_care">Data &amp; Care</string>
-    <string name="str_scan_qr_code">Please scan QR code</string>
-    <string name="str_version">"Version: "</string>
+    <string name="str_activated">Активирован</string>
+    <string name="str_check_activation">Пожалуйста, зарегистрируйте устройство.</string>
+    <string name="str_set_active_param">Согласно параметрам для регистрации.</string>
+    <string name="str_reboot_active">Пожалуйста, перезагрузите для завершения активации.</string>
+    <string name="connect_server_failed">Не удалось подключиться к серверу.</string>
+    <string name="connect_check">Пожалуйста, проверьте сеть или сервер.</string>
+    <string name="str_data_care">Данные и уход</string>
+    <string name="str_scan_qr_code">Пожалуйста, отсканируйте QR код</string>
+    <string name="str_version">"Версия: "</string>
     <string name="str_ip">"IP: "</string>
-    <string name="str_gateway">"Gateway: "</string>
-    <string name="str_netmask">"Netmask: "</string>
-    <string name="str_register_id">"Register ID: "</string>
-    <string name="str_server_ip">"Server IP: "</string>
+    <string name="str_gateway">"Шлюз: "</string>
+    <string name="str_netmask">"Маска подсети: "</string>
+    <string name="str_register_id">"ИД регистрации: "</string>
+    <string name="str_server_ip">"IP сервера: "</string>
     <string name="str_dv_code">"Заводской номер устройства: "</string>
     <string name="str_dv_type_id">"Модель устройства: "</string>
     <string name="str_dv_vs">"Аппаратная версия: "</string>
     <string name="str_restart">Restart</string>
     <string name="please_enter_ip_address">Пожалуйста, выберите устройство Bluetooth</string>
 
-    <string name="str_nfc_read_fail">Read code number failed, please check again.</string>
-    <string name="str_countdown_end">Countdown end</string>
-    <string name="str_measurement_results">Measurement results</string>
-    <string name="str_temperature">"Temperature: "</string>
-    <string name="str_blood_oxygen">"Blood oxygen: "</string>
-    <string name="str_heart_rate">"Heart rate: "</string>
-    <string name="str_heart2_rate">"Heart rate"</string>
-    <string name="str_heart3_rate">"Heart rate"</string>
-    <string name="str_blood_sugar">"Blood sugar: "</string>
-    <string name="str_systolic_blood_pressure">"Systolic blood pressure: "</string>
-    <string name="str_diastolic_blood_pressure">"Diastolic blood pressure: "</string>
-    <string name="str_pulse">"Pulse: "</string>
-
-    <string name="no_more_data">No more data!</string>
-    <string name="total_fees">Total: %d</string>
-    <string name="countdown_title">Countdown</string>
-    <string name="add_countdown">Add countdown</string>
-    <string name="oxygen_countdown">Oxygen</string>
-    <string name="transfusion_countdown">Transfusion</string>
-    <string name="skin_test_countdown">Skin test</string>
-    <string name="countdown_time_less_1_min">Countdown time must more than 1 min!</string>
-    <string name="countdown_time_type_error">Countdown time must more than 1 min and select a countdown type!</string>
-    <string name="countdown_end">Countdown end</string>
-    <string name="hint_countdown_time_type_error">Countdown time must more than 1 min and hint text must not empty!</string>
-    <string name="exit_hint">Exit hint</string>
-    <string name="set_hint">Set hint</string>
-
-    <string name="department_info">Department info</string>
-    <string name="hospital_info">Hospital info</string>
-
-    <string name="str_signs">Signs</string>
-    <string name="str_sleep_monitor">Sleep monitor</string>
-    <string name="str_device_online">Online</string>
-    <string name="str_device_offline">Offline</string>
-    <string name="str_in_bed">In bed</string>
-    <string name="str_out_bed">Out of bed</string>
-    <string name="str_snore">Snore</string>
-    <string name="str_body_move">Movement</string>
-    <string name="str_sleep_status">Status: %s</string>
-    <string name="str_sleep_data_report">Sleep data report</string>
-    <string name="str_sleep_duration">Sleep duration</string>
-    <string name="str_sleep_time">Sleep time</string>
-    <string name="str_sleep_poor">Poor</string>
+    <string name="str_nfc_read_fail">Не удалось прочитать код, пожалуйста, проверьте снова.</string>
+    <string name="str_countdown_end">Конец обратного отсчета</string>
+    <string name="str_measurement_results">Результаты измерения</string>
+    <string name="str_temperature">"Температура: "</string>
+    <string name="str_blood_oxygen">"Кислород в крови: "</string>
+    <string name="str_heart_rate">"Частота сердечных сокращений: "</string>
+    <string name="str_heart2_rate">"Частота сердечных сокращений"</string>
+    <string name="str_heart3_rate">"Частота сердечных сокращений"</string>
+    <string name="str_blood_sugar">"Уровень сахара в крови: "</string>
+    <string name="str_systolic_blood_pressure">"Систолическое артериальное давление: "</string>
+    <string name="str_diastolic_blood_pressure">"Диастолическое артериальное давление: "</string>
+    <string name="str_pulse">"Пульс: "</string>
+
+    <string name="no_more_data">Больше нет данных!</string>
+    <string name="total_fees">Итого: %d</string>
+    <string name="countdown_title">Обратный отсчет</string>
+    <string name="add_countdown">Добавить обратный отсчет</string>
+    <string name="oxygen_countdown">Кислород</string>
+    <string name="transfusion_countdown">Переливание крови</string>
+    <string name="skin_test_countdown">Тест на кожу</string>
+    <string name="countdown_time_less_1_min">Время обратного отсчета должно быть более 1 минуты!</string>
+    <string name="countdown_time_type_error">Время обратного отсчета должно быть более 1 минуты и выбран тип обратного отсчета!</string>
+    <string name="countdown_end">Конец обратного отсчета</string>
+    <string name="hint_countdown_time_type_error">Время обратного отсчета должно быть более 1 минуты, а текст подсказки не должен быть пустым!</string>
+    <string name="exit_hint">Выходная подсказка</string>
+    <string name="set_hint">Установить подсказку</string>
+    <string name="empty_bed">Нет</string>
+    <string name="empty">ноль</string>
+
+    <string name="department_info">Информация о отделении</string>
+    <string name="hospital_info">Информация о больницы</string>
+
+    <string name="str_signs">Признаки</string>
+    <string name="str_sleep_monitor">Монитор сна</string>
+    <string name="str_device_online">Онлайн</string>
+    <string name="str_device_offline">Оффлайн</string>
+    <string name="str_in_bed">В кровати</string>
+    <string name="str_out_bed">Из кровати</string>
+    <string name="str_snore">Храп</string>
+    <string name="str_body_move">Движение</string>
+    <string name="str_sleep_status">Статус: %s</string>
+    <string name="str_sleep_data_report">Отчет о данных сна</string>
+    <string name="str_sleep_duration">Продолжительность сна</string>
+    <string name="str_sleep_time">Время сна</string>
+    <string name="str_sleep_poor">Плохой</string>
     <string name="str_sleep_poor2">Плохо</string>
     <string name="str_sleep_poor3">Хорошо</string>
     <string name="str_sleep_poor4">Отлично</string>
-    <string name="str_sleep_preferable">Sleep preferable</string>
-    <string name="str_sleep_monitor_data">Sleep monitor data</string>
-    <string name="str_goto_bed_time">Goto bed time</string>
-    <string name="str_inbed_time">In bed time</string>
-    <string name="str_average_heart_rate">Average heart rate</string>
-    <string name="str_snore_times">Snore times</string>
-    <string name="str_deep_sleep_duration">Deep sleep duration</string>
-    <string name="str_out_of_bed_times">Out of bed times</string>
-    <string name="str_average_respiration_rate">Average respiration rate</string>
-    <string name="str_body_move_times">Body move times</string>
-    <string name="str_sleep_efficiency">Sleep efficiency</string>
-    <string name="str_sleep_data_list">Sleep data list</string>
-    <string name="str_breathe">Breathe:</string>
-    <string name="str_breathe2">Breathe exponent</string>
-    <string name="str_breathe3">Breathe</string>
+    <string name="str_sleep_preferable">Предпочитаемый сон</string>
+    <string name="str_sleep_monitor_data">Данные монитора сна</string>
+    <string name="str_goto_bed_time">Время отхода ко сну</string>
+    <string name="str_inbed_time">Время в кровати</string>
+    <string name="str_average_heart_rate">Средняя частота сердечных сокращений</string>
+    <string name="str_snore_times">Количество храпа</string>
+    <string name="str_deep_sleep_duration">Продолжительность глубокого сна</string>
+    <string name="str_out_of_bed_times">Количество выходов из кровати</string>
+    <string name="str_average_respiration_rate">Средняя частота дыхания</string>
+    <string name="str_body_move_times">Количество движений тела</string>
+    <string name="str_sleep_efficiency">Эффективность сна</string>
+    <string name="str_sleep_data_list">Список данных сна</string>
+    <string name="str_breathe">Дыхание:</string>
+    <string name="str_breathe2">Индекс дыхания</string>
+    <string name="str_breathe3">Дыхание</string>
     <string name="str_breathe_nuber">" Вторая/доля"</string>
 
-    <string name="device_not_support">Device not support!</string>
-    <string name="enable_bt_gateway">Enable BT gateway</string>
-    <string name="disable_bt_gateway">Disable BT gateway</string>
-    <string name="enable_bluetooth">Please enable bluetooth</string>
-    <string name="reboot_register">Please reboot and register device</string>
-    <string name="str_device_info">Device info</string>
-
-    <string name="sip_service_not_running">SIP service not running</string>
-    <string name="device_test">Device test</string>
-    <string name="str_record_playing">Playing</string>
-    <string name="str_record_play_complete">Play complete</string>
-    <string name="str_recording">Recording</string>
-
-    <string name="str_incoming_call">Incoming-</string>
-    <string name="str_outgoing_call">Outgoing-</string>
-    <string name="str_event_title">Event-</string>
-    <string name="str_accept_call">Accept</string>
-    <string name="str_voice_msg_done">Complete</string>
-    <string name="str_voice_msg_undo">Undo</string>
-
-    <string name="bed_in_nursing">Exit nursing?</string>
-    <string name="bed_set_nursing">Set nursing status</string>
-    <string name="param_set_error">Set params error!</string>
+    <string name="device_not_support">Устройство не поддерживается!</string>
+    <string name="enable_bt_gateway">Включить шлюз BT</string>
+    <string name="disable_bt_gateway">Отключить шлюз BT</string>
+    <string name="enable_bluetooth">Пожалуйста, включите Bluetooth</string>
+    <string name="reboot_register">Пожалуйста, перезагрузите и зарегистрируйте устройство</string>
+    <string name="str_device_info">Информация об устройстве</string>
+
+    <string name="sip_service_not_running">Сервис SIP не запущен</string>
+    <string name="device_test">Тестирование устройства</string>
+    <string name="str_record_playing">Воспроизведение</string>
+    <string name="str_record_play_complete">Воспроизведение завершено</string>
+    <string name="str_recording">Запись</string>
+
+    <string name="str_incoming_call">Входящий-</string>
+    <string name="str_outgoing_call">Исходящий-</string>
+    <string name="str_event_title">Событие-</string>
+    <string name="str_accept_call">Принять</string>
+    <string name="str_voice_msg_done">Готово</string>
+    <string name="str_voice_msg_undo">Отменить</string>
+
+    <string name="bed_in_nursing">Выйти из ухода?</string>
+    <string name="bed_set_nursing">Установить статус ухода</string>
+    <string name="param_set_error">Ошибка установки параметров!</string>
     <string name="reinforce_sent">Паведамленне адпраўлена, пачакайце</string>
     <string name="reinforce_sent1">Информация о сигнале кнопки отправлена</string>
     <string name="reinforce_sent2">Информация о сигнале двери отправлена</string>
     <string name="reinforce_sent3">Информация об оповещении о дыме отправлена</string>
     <string name="reinforce_sent4">Информация об оповещении инфракрасного излучения отправлена</string>
     <string name="reinforce_respond">Reinforce respond</string>
-    <string name="str_server_ip_empty">Server ip is empty!</string>
-
-    <string name="str_positioned">Positioned</string>
-    <string name="str_position">Position</string>
-    <string name="str_patrol">Patrol</string>
-    <string name="str_patroled">Patrol end</string>
-    <string name="str_device_title">Device info</string>
-    <string name="str_not_support">Not support</string>
-    <string name="str_type_error">Type error</string>
-    <string name="str_result_error">Error result</string>
-    <string name="str_data_list">" data list"</string>
-    <string name="str_unit">"Unit: "</string>
-    <string name="str_systolic_blood_pressure2">Systolic blood pressure</string>
-    <string name="str_diastolic_blood_pressure2">Diastolic blood pressure</string>
+    <string name="reinforce_respond_2">Ваш запрос обработан, пожалуйста, подождите</string>
+    <string name="str_server_ip_empty">IP сервера пуст!</string>
+
+    <string name="str_positioned">Расположен</string>
+    <string name="str_position">Позиция</string>
+    <string name="str_patrol">Патруль</string>
+    <string name="str_patroled">Конец патруля</string>
+    <string name="str_device_title">Информация об устройстве</string>
+    <string name="str_not_support">Не поддерживается</string>
+    <string name="str_type_error">Тип ошибки</string>
+    <string name="str_result_error">Ошибочный результат</string>
+    <string name="str_data_list">"список данных"</string>
+    <string name="str_unit">"Единица измерения: "</string>
+    <string name="str_systolic_blood_pressure2">Систолическое артериальное давление</string>
+    <string name="str_diastolic_blood_pressure2">Диастолическое артериальное давление</string>
 
     <string name="str_times">%d</string>
-    <string name="str_times_per_min">%d times/min</string>
-    <string name="sleep_qualified">Sleep qualified!</string>
-    <string name="sleep_unqualified">Sleep unqualified %d</string>
-    <string name="str_hour_min">%d hour %d min</string>
-
-    <string name="str_empty_card_no">Empty card no.</string>
-    <string name="countdown_select">Select</string>
-    <string name="time_10min">10 minutes</string>
-    <string name="time_15min">15 minutes</string>
-    <string name="time_20min">20 minutes</string>
-    <string name="time_25min">25 minutes</string>
-    <string name="time_30min">30 minutes</string>
-    <string name="time_60min">60 minutes</string>
-    <string name="time_90min">90 minutes</string>
-    <string name="time_120min">120 minutes</string>
-    <string name="time_minute">Minute</string>
-    <string name="str_add_countdown">Add countdown</string>
-    <string name="str_in_countdown">Countdown…</string>
-    <string name="disable_countdown">Disable countdown</string>
-
-    <string name="str_data_graph">Graph</string>
-    <string name="str_play">Play</string>
-    <string name="str_description">Description</string>
-    <string name="str_contacts">Contacts</string>
-    <string name="str_show_more">More</string>
-
-    <string name="str_select_type_for_nurse">Please select type</string>
-    <string name="str_enter_medical_care">Enter medical</string>
-    <string name="str_exit_medical_care">Exit medical</string>
-    <string name="str_card_no">No.</string>
-    <string name="str_input_card_no">Input No.</string>
-    <string name="str_password">Password</string>
-    <string name="str_swipe_nfc_card">Swipe card.</string>
-    <string name="str_welcome">Welcome,</string>
-    <string name="str_medical_care_area">Medical area</string>
-    <string name="str_be_quiet">Be Quiet</string>
-    <string name="str_input_custom_info">Customer info</string>
-    <string name="str_hint_time">Hint time</string>
-    <string name="str_hint_text">Hint text</string>
-    <string name="str_no_noise">"Don't speak loudly"</string>
-    <string name="str_no_entry">"No entry"</string>
-    <string name="str_no_disturb">"Do not disturb"</string>
-    <string name="str_no_visitation">"No visitation"</string>
-    <string name="str_no_gather">"Do not gather"</string>
-
-    <string name="str_start">Start</string>
-    <string name="str_start_1">Start</string>
-    <string name="str_start_2">Start</string>
-    <string name="str_start_3">Start</string>
-    <string name="str_start_4">Start</string>
-    <string name="str_network_config">Network config</string>
-    <string name="str_app_update">Check update</string>
-    <string name="str_app_release_date">Release date:</string>
-    <string name="str_device_qr">QR code</string>
-    <string name="str_device_switch">Device switch</string>
-    <string name="str_bt_gateway">BT gateway</string>
-    <string name="str_433_switch">433 switch</string>
+    <string name="str_times_per_min">%d раз/мин</string>
+    <string name="sleep_qualified">Квалифицированный сон!</string>
+    <string name="sleep_unqualified">Неквалифицированный сон %d</string>
+    <string name="str_hour_min">%d час %d мин</string>
+
+    <string name="str_empty_card_no">Пустой номер карты.</string>
+    <string name="countdown_select">Выбор</string>
+    <string name="time_10min">10 минут</string>
+    <string name="time_15min">15 минут</string>
+    <string name="time_20min">20 минут</string>
+    <string name="time_25min">25 минут</string>
+    <string name="time_30min">30 минут</string>
+    <string name="time_60min">60 минут</string>
+    <string name="time_90min">90 минут</string>
+    <string name="time_120min">120 минут</string>
+    <string name="time_minute">Минута</string>
+    <string name="str_add_countdown">Добавить обратный отсчет</string>
+    <string name="str_in_countdown">Обратный отсчет...</string>
+    <string name="disable_countdown">Отключить обратный отсчет</string>
+
+    <string name="str_data_graph">График</string>
+    <string name="str_play">Воспроизвести</string>
+    <string name="str_description">Описание</string>
+    <string name="str_contacts">Контакты</string>
+    <string name="str_show_more">Подробнее</string>
+
+    <string name="str_select_type_for_nurse">Пожалуйста, выберите тип</string>
+    <string name="str_enter_medical_care">Войти в медицинское учреждение</string>
+    <string name="str_exit_medical_care">Впокидать</string>
+    <string name="str_card_no">№</string>
+    <string name="str_input_card_no">Введите №</string>
+    <string name="str_password">Пароль</string>
+    <string name="str_swipe_nfc_card">Проведите карту.</string>
+    <string name="str_welcome">Добро пожаловать,</string>
+    <string name="str_medical_care_area">Медицинская зона</string>
+    <string name="str_be_quiet">Будь тихим</string>
+    <string name="str_input_custom_info">Информация о клиенте</string>
+    <string name="str_hint_time">Время подсказки</string>
+    <string name="str_hint_text">Текст подсказки</string>
+    <string name="str_no_noise">"Не говори громко"</string>
+    <string name="str_no_entry">"Вход запрещен"</string>
+    <string name="str_no_disturb">"Не беспокоить"</string>
+    <string name="str_no_visitation">"Посещение запрещено"</string>
+    <string name="str_no_gather">"Не собираться"</string>
+
+    <string name="str_start">Начало</string>
+    <string name="str_start_1">Начало</string>
+    <string name="str_start_2">Начало</string>
+    <string name="str_start_3">Начало</string>
+    <string name="str_start_4">Начало</string>
+    <string name="str_network_config">Конфигурация сети</string>
+    <string name="str_app_update">Проверка обновлений</string>
+    <string name="str_app_release_date">Дата выпуска:</string>
+    <string name="str_device_qr">QR код</string>
+    <string name="str_device_switch">Переключение устройства</string>
+    <string name="str_bt_gateway">Шлюз BT</string>
+    <string name="str_433_switch">Переключатель 433</string>
     <string name="str_sleep_switch">Мониторинг сна </string>
 
-    <string name="test_target_sip_account">Please input sip id</string>
-    <string name="test_hint_sip_account">Sip id</string>
-    <string name="test_sip_call">Call test</string>
-    <string name="test_peripheral">Peripheral test</string>
-    <string name="test_peripheral_connect_check">Please check peripheral device</string>
-    <string name="test_handle_call_button">Handle call button test</string>
-    <string name="test_handle_cancel_button">Handle cancel button test</string>
+    <string name="test_target_sip_account">Пожалуйста, введите SIP ID</string>
+    <string name="test_hint_sip_account">SIP ID</string>
+    <string name="test_sip_call">Тестирование вызовов SIP</string>
+    <string name="test_peripheral">Тестирование периферийных устройств</string>
+    <string name="test_peripheral_connect_check">Пожалуйста, проверьте периферийное устройство</string>
+    <string name="test_handle_call_button">Тестирование кнопки обработки вызовов</string>
+    <string name="test_handle_cancel_button">Тестирование кнопки отмены</string>
     <string name="test_handle_call_host_button">Тест подъема рукоятки</string>
     <string name="test_handle_cancel_host_button">Тест отпускания рукоятки</string>
-    <string name="test_device_call_button">Device call button test</string>
-    <string name="test_device_cancel_button">Device cancel button test</string>
-    <string name="test_sos_button">SOS button test</string>
-    <string name="test_mic_record">Mic record test</string>
-
-    <string name="fees_name">Fees name</string>
-    <string name="fees_type">Fees type</string>
-    <string name="fees_price">Fees price</string>
-    <string name="fees_time">Fees time</string>
-    <string name="fees_detail">Fees detail</string>
-    <string name="fees_total">Total</string>
-    <string name="str_page_up">Up</string>
-    <string name="str_page_down">Down</string>
-
-    <string name="str_processing">Processing…</string>
-    <string name="str_recover">Recover</string>
-    <string name="check_network_type">Please select network type</string>
-    <string name="str_set_network_info">Please set network</string>
-    <string name="str_reboot_check">Reboot device?</string>
+    <string name="test_device_call_button">Тестирование кнопки вызова устройства</string>
+    <string name="test_device_cancel_button">Тестирование кнопки отмены устройства</string>
+    <string name="test_sos_button">Тестирование кнопки SOS</string>
+    <string name="test_mic_record">Тестирование записи микрофона</string>
+
+    <string name="fees_name">Название тарифа</string>
+    <string name="fees_type">Тип тарифа</string>
+    <string name="fees_price">Цена тарифа</string>
+    <string name="fees_time">Время тарифа</string>
+    <string name="fees_detail">Детали тарифа</string>
+    <string name="fees_total">Итого</string>
+    <string name="str_page_up">Вверх</string>
+    <string name="str_page_down">Вниз</string>
+
+    <string name="str_processing">Обработка...</string>
+    <string name="str_recover">Восстановление</string>
+    <string name="check_network_type">Пожалуйста, выберите тип сети</string>
+    <string name="str_set_network_info">Пожалуйста, установите сеть</string>
+    <string name="str_reboot_check">Перезагрузить устройство?</string>
     <string name="str_reboot_check_2">Нажмите подтвердить, чтобы начать перезагрузку устройства!</string>
 
-    <string name="str_server_ip_setting">Please set server IP</string>
-    <string name="str_server_ip_tips">Only support number and dot.</string>
-
-    <string name="str_age">"Age: "</string>
-    <string name="str_gender_male">gender: male</string>
-    <string name="str_gender_female">gender: female</string>
-    <string name="str_gender_none">"gender: "</string>
-    <string name="str_tips">Tips</string>
-    <string name="str_nurse_station">Nurse station</string>
-    <string name="str_call_others">Call others</string>
-    <string name="str_exit_medical_care_tips">Exit medical?</string>
-    <string name="str_blood_sugar_data">Blood sugar data</string>
-    <string name="str_index">Index</string>
-    <string name="str_param">Param</string>
-    <string name="str_value">Value</string>
-    <string name="str_time">Time</string>
-    <string name="blood_sugar_after_2_hours">2 hours after meals</string>
-    <string name="blood_sugar_unit">Unit: mm/L</string>
-    <string name="str_blood_sugar_name">Blood sugar</string>
-    <string name="str_data">Data</string>
-    <string name="str_report">Report</string>
+    <string name="str_server_ip_setting">Пожалуйста, установите IP-адрес сервера</string>
+    <string name="str_server_ip_tips">Поддерживаются только цифры и точки.</string>
+
+    <string name="str_age">"Возраст: "</string>
+    <string name="str_gender_male">пол: мужской</string>
+    <string name="str_gender_female">пол: женский</string>
+    <string name="str_gender_none">"пол: "</string>
+    <string name="str_tips">Советы</string>
+    <string name="str_nurse_station">Станция медсестер</string>
+    <string name="str_call_others">Вызвать других</string>
+    <string name="str_exit_medical_care_tips">Выйти из медицинского?</string>
+    <string name="str_blood_sugar_data">Данные о сахаре в крови</string>
+    <string name="str_index">Индекс</string>
+    <string name="str_param">Параметр</string>
+    <string name="str_value">Значение</string>
+    <string name="str_time">Время</string>
+    <string name="blood_sugar_after_2_hours">2 часа после еды</string>
+    <string name="blood_sugar_unit">Единица измерения: мм/л</string>
+    <string name="str_blood_sugar_name">Сахар в крови</string>
+    <string name="str_data">Данные</string>
+    <string name="str_report">Отчет</string>
     <string name="confirm">Подключить</string>
 
 
@@ -572,5 +575,20 @@
     <string name="act_message_4">Активируйте после установки параметров справа</string>
     <string name="act_message_5">Пожалуйста, перезагрузите устройство и активируйте его заново</string>
 
+    <string name="door_mom_main_1">"Дата заезда:"</string>
+    <string name="door_mom_main_2">"Дата выезда:"</string>
+    <string name="door_mom_title_1">Информация о Маме</string>
+    <string name="door_mom_title_2">Имя Мамы</string>
+    <string name="door_mom_title_3">Возраст Мамы</string>
+    <string name="door_mom_title_4">Информация о Младенце</string>
+    <string name="door_mom_title_5">Имя Младенца</string>
+    <string name="door_mom_title_6">Пол Младенца</string>
+    <string name="baby_bg_txt">"Проведите хороший <font color='#F8EDC7'>период послеродового восстановления</font> и будьте счастливы всю жизнь"</string>
+
+    <string name="door_hos_title_1">Занятость</string>
+    <string name="door_hos_title_2">Доступный</string>
+    <string name="door_hos_title_3">Номер кровати</string>
+    <string name="set_hint_2">Отображение на Экране Блокировки</string>
+    <string name="set_huli_2">Войти в Уход за этой Койкой</string>
 
 </resources>

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

@@ -103,6 +103,9 @@
     <string name="product_desc">产品说明:</string>
     <string name="device_error">设备网络出现异常，请检查网络或尝试断电重启!</string>
 
+    <string name="empty_bed">空床位</string>
+    <string name="empty">无</string>
+
     <string name="str_voice_msg_start">开始留言</string>
     <string name="str_voice_msg_started">留言中</string>
     <string name="str_voice_msg_end">结束</string>
@@ -125,6 +128,8 @@
     <string name="str_set_resposible_fail">分配处理人员失败</string>
     <string name="str_event_handle_warning">您还有事件未处理</string>
     <string name="str_event_response">已响应: %s %s</string>
+<!--    <string name="str_event_response_2">已响应</string>-->
+<!--    <string name="str_event_response_3">请稍后</string>-->
     <string name="str_event_cancel">事件已取消</string>
     <string name="str_event_done">事件已完成</string>
     <string name="str_search">搜索</string>
@@ -329,6 +334,8 @@
     <string name="exit_hint">退出提示</string>
     <string name="set_hint">设置提示</string>
 
+
+
     <string name="department_info">科室介绍</string>
     <string name="hospital_info">医院介绍</string>
 
@@ -397,6 +404,7 @@
     <string name="reinforce_sent4">红外报警信息已发出</string>
 
     <string name="reinforce_respond">您的增援已响应，护士正在赶来的路上</string>
+    <string name="reinforce_respond_2">您的请求已响应，请稍后</string>
     <string name="str_server_ip_empty">服务器地址不能为空</string>
 
     <string name="str_positioned">已定位</string>
@@ -588,7 +596,22 @@
     <string name="act_message_4">设置右侧参数后激活</string>
     <string name="act_message_5">请重启设备，重新激活设备</string>
 
-
+    <!--月子中心-->
+    <string name="door_mom_main_1">"入住日期："</string>
+    <string name="door_mom_main_2">"离宫日期："</string>
+    <string name="door_mom_title_1">宝妈信息</string>
+    <string name="door_mom_title_2">宝妈姓名</string>
+    <string name="door_mom_title_3">宝妈年龄</string>
+    <string name="door_mom_title_4">宝宝信息</string>
+    <string name="door_mom_title_5">宝宝姓名</string>
+    <string name="door_mom_title_6">宝宝性别</string>
+    <string name="baby_bg_txt">坐个好<font color='#F8EDC7'>月子</font>幸福一辈子</string>
+
+    <string name="door_hos_title_1">病房人数</string>
+    <string name="door_hos_title_2">空余床位</string>
+    <string name="door_hos_title_3">床位号</string>
+    <string name="set_hint_2">锁屏显示</string>
+    <string name="set_huli_2">该房病床进入护理</string>
 
 
 </resources>

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

@@ -10,6 +10,8 @@
     <string name="colleague">Colleagues</string>
     <string name="group_message">Group message</string>
     <string name="reconnect">Reconnect</string>
+    <string name="empty_bed">Null</string>
+    <string name="empty">null</string>
 
     <string name="default_nurse_config_name">NULL</string>
     <string name="str_empty">NULL</string>
@@ -393,9 +395,10 @@
     <string name="reinforce_sent3">Smoke alarm information has been sent</string>
     <string name="reinforce_sent4">Infrared alarm information has been sent</string>
     <string name="reinforce_respond">Reinforce respond</string>
+    <string name="reinforce_respond_2">Your request has been responded to, please wait</string>
     <string name="str_server_ip_empty">Server ip is empty!</string>
 
-    <string name="str_positioned">Positioned</string>
+    <string name="str_positioned">Position end</string>
     <string name="str_position">Position</string>
     <string name="str_patrol">Patrol</string>
     <string name="str_patroled">Patrol end</string>
@@ -500,9 +503,9 @@
     <string name="str_server_ip_setting">Please set server IP</string>
     <string name="str_server_ip_tips">Only support number and dot.</string>
     <string name="str_age">"Age: "</string>
-    <string name="str_gender_male">Gender: male</string>
-    <string name="str_gender_female">Gender: female</string>
-    <string name="str_gender_none">"Gender: "</string>
+    <string name="str_gender_male">Gender:male</string>
+    <string name="str_gender_female">Gender:female</string>
+    <string name="str_gender_none">Gender:</string>
     <string name="str_tips">Tips</string>
     <string name="str_nurse_station">Nurse station</string>
     <string name="str_call_others">Call others</string>
@@ -586,5 +589,20 @@
     <string name="act_message_5">Please restart the device and activate it again</string>
 
 
+    <string name="door_mom_main_1">"Check-in Date:"</string>
+    <string name="door_mom_main_2">"Check-out Date:"</string>
+    <string name="door_mom_title_1">Mom Information</string>
+    <string name="door_mom_title_2">Mom Name</string>
+    <string name="door_mom_title_3">Mom Age</string>
+    <string name="door_mom_title_4">Baby Information</string>
+    <string name="door_mom_title_5">Baby Name</string>
+    <string name="door_mom_title_6">Baby Gender</string>
+    <string name="baby_bg_txt">"Have a good <font color='#F8EDC7'>confinement</font> and happiness for a lifetime"</string>
+
+    <string name="door_hos_title_1">Occ rate</string>
+    <string name="door_hos_title_2">Open Beds</string>
+    <string name="door_hos_title_3">Bed number</string>
+    <string name="set_hint_2">Lock Screen Display</string>
+    <string name="set_huli_2">Enter Nursing for This Bed</string>
 
 </resources>