Browse Source

无服务器点对点设备音视频对讲

weizhengliang 1 year ago
parent
commit
b452bd7b10
100 changed files with 9005 additions and 453 deletions
  1. 3 2
      android_host/src/main/common/java/com/wdkl/ncs/host/service/WdklSipService.java
  2. 4 7
      android_host/src/main/h10_wke_1h/AndroidManifest.xml
  3. 2 2
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/activity/AppUpdateActivity.kt
  4. 6 6
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt
  5. 14 36
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/activity/SipHomeActivity.kt
  6. 1 0
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/di/NurseHomeComponent.kt
  7. 78 89
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/DeviceManageFragment.kt
  8. 119 0
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/HomeCallFragment.kt
  9. 60 7
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/SipComingCallFragment.kt
  10. 2 2
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/SystemSettingsFragment.kt
  11. 1 1
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/settingconfig/SettingConfig.java
  12. 22 0
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/util/AppUtil.java
  13. 1 1
      android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/util/RingPlayHelper.java
  14. BIN
      android_host/src/main/h10_wke_1h/res/drawable/ic_home_new.png
  15. BIN
      android_host/src/main/h10_wke_1h/res/drawable/ic_settings_new.png
  16. BIN
      android_host/src/main/h10_wke_1h/res/drawable/ic_video_callout.png
  17. BIN
      android_host/src/main/h10_wke_1h/res/drawable/ic_voice_callout.png
  18. BIN
      android_host/src/main/h10_wke_1h/res/drawable/main_bg_1280x800.jpg
  19. BIN
      android_host/src/main/h10_wke_1h/res/drawable/main_bg_800x1280.png
  20. 6 0
      android_host/src/main/h10_wke_1h/res/drawable/round_button.xml
  21. 25 0
      android_host/src/main/h10_wke_1h/res/drawable/seek_bar_bg.xml
  22. 14 0
      android_host/src/main/h10_wke_1h/res/drawable/seek_bar_thumb.xml
  23. 2 2
      android_host/src/main/h10_wke_1h/res/drawable/selector_button_text_color.xml
  24. 471 0
      android_host/src/main/h10_wke_1h/res/layout-land/activity_nurse_home.xml
  25. 66 0
      android_host/src/main/h10_wke_1h/res/layout-land/activity_register.xml
  26. 175 0
      android_host/src/main/h10_wke_1h/res/layout-land/activity_sip_home.xml
  27. 106 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_broadcast.xml
  28. 176 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_call_records_item.xml
  29. 70 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_calling_item.xml
  30. 26 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_doctor_host.xml
  31. 61 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_event_list_item.xml
  32. 26 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_extension_device.xml
  33. 71 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_frame_bed_vos.xml
  34. 39 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_frame_part_item.xml
  35. 103 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_hospital_frame_part.xml
  36. 25 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_inpatient_ward.xml
  37. 17 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_led_item.xml
  38. 26 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_mobile_device.xml
  39. 26 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_other_host.xml
  40. 16 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_responsibility_bed.xml
  41. 76 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_sickbed.xml
  42. 43 0
      android_host/src/main/h10_wke_1h/res/layout-land/adapter_visit_bed.xml
  43. 323 0
      android_host/src/main/h10_wke_1h/res/layout-land/add_the_timing.xml
  44. 68 0
      android_host/src/main/h10_wke_1h/res/layout-land/call_dialog_lay.xml
  45. 17 0
      android_host/src/main/h10_wke_1h/res/layout-land/digital_item.xml
  46. 23 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_beds_in_the_ward.xml
  47. 65 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_broadcast.xml
  48. 192 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_call_records.xml
  49. 229 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_device_manage.xml
  50. 67 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_doctor_host.xml
  51. 134 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_entraceguard_video.xml
  52. 42 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_frame_part.xml
  53. 250 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_home.xml
  54. 71 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_home_call.xml
  55. 26 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_inpatient_ward.xml
  56. 278 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_led_settings.xml
  57. 75 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_nurse_move.xml
  58. 109 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_other_host.xml
  59. 28 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_sickbed.xml
  60. 1656 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_system_settings.xml
  61. 12 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_trust_management.xml
  62. 166 0
      android_host/src/main/h10_wke_1h/res/layout-land/fragment_visit_management.xml
  63. 39 0
      android_host/src/main/h10_wke_1h/res/layout-land/item_cost_detail.xml
  64. 38 0
      android_host/src/main/h10_wke_1h/res/layout-land/item_cost_main_view.xml
  65. 38 0
      android_host/src/main/h10_wke_1h/res/layout-land/item_exam_detail.xml
  66. 29 0
      android_host/src/main/h10_wke_1h/res/layout-land/item_exam_main_view.xml
  67. 85 0
      android_host/src/main/h10_wke_1h/res/layout-land/language_set_dialog.xml
  68. 67 0
      android_host/src/main/h10_wke_1h/res/layout-land/password_dialog_lay.xml
  69. 457 0
      android_host/src/main/h10_wke_1h/res/layout-land/right_basic_information.xml
  70. 137 0
      android_host/src/main/h10_wke_1h/res/layout-land/right_list.xml
  71. 189 0
      android_host/src/main/h10_wke_1h/res/layout-land/server_config_dialog_lay.xml
  72. 217 0
      android_host/src/main/h10_wke_1h/res/layout-land/sip_call_layout.xml
  73. 212 0
      android_host/src/main/h10_wke_1h/res/layout-land/sky_voice_call_layout.xml
  74. 10 0
      android_host/src/main/h10_wke_1h/res/layout-land/spinner_item.xml
  75. 45 0
      android_host/src/main/h10_wke_1h/res/layout-land/update_lay.xml
  76. 46 0
      android_host/src/main/h10_wke_1h/res/layout-land/update_tips_dialog.xml
  77. 27 0
      android_host/src/main/h10_wke_1h/res/layout-land/warning_dialog_lay.xml
  78. 160 0
      android_host/src/main/h10_wke_1h/res/layout-land/window_call_calls.xml
  79. 34 0
      android_host/src/main/h10_wke_1h/res/layout-land/window_incident.xml
  80. 176 0
      android_host/src/main/h10_wke_1h/res/layout-land/window_video_call.xml
  81. 42 0
      android_host/src/main/h10_wke_1h/res/layout-land/window_visiting.xml
  82. 136 134
      android_host/src/main/h10_wke_1h/res/layout/activity_sip_home.xml
  83. 197 122
      android_host/src/main/h10_wke_1h/res/layout/fragment_device_manage.xml
  84. 71 0
      android_host/src/main/h10_wke_1h/res/layout/fragment_home_call.xml
  85. 58 11
      android_host/src/main/h10_wke_1h/res/layout/sip_call_layout.xml
  86. 1 1
      android_host/src/main/h10_wke_1h/res/values/strings.xml
  87. 28 3
      app/src/main/code/com/wdkl/app/ncs/application/Application.kt
  88. 403 0
      common/src/main/code/com/wdkl/ncs/android/lib/widget/VerticalSeekBar.java
  89. 189 0
      common/src/main/code/com/wdkl/ncs/android/lib/widget/VerticalSeekBarWrapper.java
  90. 9 0
      common/src/main/res/values/attrs.xml
  91. 2 2
      middleware/src/main/code/com/wdkl/ncs/android/middleware/helper/PassCheckDialogHelper.java
  92. 18 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/utils/CommonUtils.java
  93. 9 9
      middleware/src/main/res/layout/extension_sip_dialog.xml
  94. 8 8
      middleware/src/main/res/layout/password_check_dialog.xml
  95. 8 8
      middleware/src/main/res/layout/sip_dialog.xml
  96. BIN
      resource/src/main/res/drawable/av_mute.png
  97. BIN
      resource/src/main/res/drawable/av_mute_hover.png
  98. 5 0
      resource/src/main/res/drawable/av_mute_selector.xml
  99. 5 0
      resource/src/main/res/drawable/av_speaker_selector.xml
  100. 0 0
      resource/src/main/res/drawable/ic_speaker_off.xml

+ 3 - 2
android_host/src/main/common/java/com/wdkl/ncs/host/service/WdklSipService.java

@@ -173,14 +173,14 @@ public class WdklSipService extends Service {
                 }
             }
 
-            @Override
+            /*@Override
             public void onRegistrationStateChanged(Core core, ProxyConfig cfg, RegistrationState state, String message) {
                 if (!SettingConfig.getSipEnabled(BaseApplication.appContext)) {
                     return;
                 }
 
                 EventBus.getDefault().post(new MessageEvent(state, Constants.EVENT_SIP_REGISTER_STATUS));
-            }
+            }*/
         };
 
         try {
@@ -199,6 +199,7 @@ public class WdklSipService extends Service {
         mCore.addListener(mCoreListener);
         mCore.setRing(null);
         mCore.setRingDuringIncomingEarlyMedia(false);
+        //mCore.setRingback(null);
         mCore.setIncTimeout(60);
 
         //SIP核心配置完成

+ 4 - 7
android_host/src/main/h10_wke_1h/AndroidManifest.xml

@@ -74,14 +74,13 @@
             android:value="GlideModule" />
         <meta-data
             android:name="design_width_in_dp"
-            android:value="1280"/>
+            android:value="1024"/>
         <meta-data
             android:name="design_height_in_dp"
-            android:value="800"/>
+            android:value="600"/>
 
         <activity android:name=".activity.RegisterActivity"
-            android:launchMode="singleInstance"
-            android:screenOrientation="landscape">
+            android:launchMode="singleInstance">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -97,12 +96,10 @@
         </activity>-->
 
         <activity android:name=".activity.SipHomeActivity"
-            android:launchMode="singleInstance"
-            android:screenOrientation="landscape">
+            android:launchMode="singleInstance">
         </activity>
 
         <activity android:name=".activity.AppUpdateActivity"
-            android:screenOrientation="landscape"
             android:launchMode="singleTask"
             android:excludeFromRecents="true"/>
 

+ 2 - 2
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/activity/AppUpdateActivity.kt

@@ -121,7 +121,7 @@ class AppUpdateActivity :BaseActivity<AppUpdatePresenter, UpdateLayBinding>(), A
     fun startInstallApk() {
         if ("YUNPAI_H6".equals(Build.MODEL)) {
             startInstallAppYunPai()
-        } else if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+        } else if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
             installAppKaer()
         } else {
             AppUpdateHelper.installAPK(this)
@@ -165,7 +165,7 @@ class AppUpdateActivity :BaseActivity<AppUpdatePresenter, UpdateLayBinding>(), A
     override fun onStop() {
         super.onStop()
 
-        if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+        if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
             StatusBarHelper.toggleStatusBar(activity, true)
         }
     }

+ 6 - 6
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -186,7 +186,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
             return@setOnTouchListener true
         }
 
-        if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+        if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
             StatusBarHelper.toggleStatusBar(activity, true)
             //permissionGranted()
         } /*else {
@@ -559,7 +559,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
 
 
         if (Settings.canDrawOverlays(this) && Settings.System.canWrite(this)) {
-            if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+            if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
                 StatusBarHelper.toggleStatusBar(activity, false)
             }
         }
@@ -587,7 +587,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         updateTcpState()
 
         if (initialized && Settings.canDrawOverlays(this) && Settings.System.canWrite(this))  {
-            if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+            if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
                 StatusBarHelper.toggleStatusBar(activity, false)
             }
         }
@@ -596,7 +596,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
     override fun onStop() {
         super.onStop()
 
-        if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+        if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
             StatusBarHelper.toggleStatusBar(activity, true)
         }
     }
@@ -870,7 +870,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         btn_reboot.setOnClickListener {
             cancelRestart = true
             handler.removeCallbacksAndMessages(null)
-            if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+            if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
                 StatusBarHelper.toggleStatusBar(activity, true)
             }
             AppUpdateHelper.restartApp(activity)
@@ -894,7 +894,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         if (batteryBroadcastReceiver != null) {
             unregisterReceiver(batteryBroadcastReceiver)
         }
-        if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+        if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
             StatusBarHelper.toggleStatusBar(activity, true)
         }
         SpeechUtil.getInstance().release()

+ 14 - 36
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/activity/SipHomeActivity.kt

@@ -113,7 +113,7 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
         AppTool.SystemUI.showNavigationBar(this,false)
         AppTool.SystemUI.ImmersiveWithBottomBarColor(this, Color.BLACK)
 
-        if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+        if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
             StatusBarHelper.toggleStatusBar(activity, true)
         }
 
@@ -256,7 +256,7 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
         }
         initialized = true
 
-        currentFragment = HomeFragment()
+        currentFragment = HomeCallFragment()
         supportFragmentManager.beginTransaction().replace(R.id.middle_fralyout, currentFragment, "").commitAllowingStateLoss()
 
         home_radio_bt.isChecked = true
@@ -274,7 +274,7 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
 
 
         if (Settings.canDrawOverlays(this) && Settings.System.canWrite(this)) {
-            if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+            if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
                 StatusBarHelper.toggleStatusBar(activity, false)
             }
         }
@@ -326,7 +326,7 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
         super.onResume()
 
         if (initialized && Settings.canDrawOverlays(this) && Settings.System.canWrite(this))  {
-            if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+            if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
                 StatusBarHelper.toggleStatusBar(activity, false)
             }
         }
@@ -335,7 +335,7 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
     override fun onStop() {
         super.onStop()
 
-        if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+        if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
             StatusBarHelper.toggleStatusBar(activity, true)
         }
     }
@@ -389,7 +389,7 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
         if (batteryBroadcastReceiver != null) {
             unregisterReceiver(batteryBroadcastReceiver)
         }
-        if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+        if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
             StatusBarHelper.toggleStatusBar(activity, true)
         }
         SpeechUtil.getInstance().release()
@@ -453,8 +453,7 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
        when(p0.id){
            R.id.home_radio_bt ->{
                if (select_id != 0) {
-                   showMiddleFragment(HomeFragment())
-                   removeRightFragment()
+                   showMiddleFragment(HomeCallFragment())
                    select_id = 0
                }
            }
@@ -462,7 +461,7 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
            R.id.system_settings_radio_bt ->{
                if (select_id != 1) {
                    select_id = 1
-                   showRightFragment(SystemSettingsFragment())
+                   showMiddleFragment(SystemSettingsFragment())
                }
            }
 
@@ -471,7 +470,6 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
                    PassCheckDialogHelper.showDialog(activity) {
                        select_id = 2
                        showMiddleFragment(DeviceManageFragment())
-                       removeRightFragment()
                    }
                }
            }
@@ -491,26 +489,6 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
         }
     }
 
-    //显示右侧设置界面
-    fun showRightFragment(fragment: Fragment){
-        supportFragmentManager.inTransaction {
-            if(currentFragmentTwo != null){
-                remove(currentFragmentTwo)
-            }
-            currentFragmentTwo = fragment
-            add(R.id.right_fralyout, fragment)
-        }
-    }
-
-    fun removeRightFragment() {
-        if (currentFragmentTwo != null) {
-            supportFragmentManager.inTransaction {
-                remove(currentFragmentTwo)
-            }
-            currentFragmentTwo = null
-        }
-    }
-
     fun addCallFragment(fragment: Fragment) {
         if (skyCallFragment != null) {
             supportFragmentManager.beginTransaction()
@@ -564,10 +542,10 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
         override fun onReceive(context: Context, intent: Intent) {
             if (intent.action == Constants.HOOK_ON) {
                 Log.e(TAG,"手柄放下 ")
+                Constants.hookOn = true
+                VoiceManagerUtil.switchAudioMode(activity, true)
                 if (System.currentTimeMillis() - hookonTime > 2000) {
-                    Constants.hookOn = true
-                    VoiceManagerUtil.switchAudioMode(activity, true)
-                    VoiceManagerUtil.setCallVoice(activity, SettingConfig.getHostCallVolume(activity))
+                    //VoiceManagerUtil.setCallVoice(activity, SettingConfig.getHostCallVolume(activity))
 
                     EventBus.getDefault().post(MessageEvent("handoff", Constants.EVENT_END_CALL))
                 }
@@ -575,11 +553,11 @@ class SipHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurseH
                 hookonTime = System.currentTimeMillis()
             } else if (intent.action == Constants.HOOK_OFF) {
                 Log.e(TAG,"手柄拿起 ")
+                Constants.hookOn = false
+                VoiceManagerUtil.switchAudioMode(activity, false)
                 EventBus.getDefault().post(MessageEvent(false, Constants.EVENT_TOGGLE_SPEAKER))
                 if (System.currentTimeMillis() - hookoffTime > 2000) {
-                    Constants.hookOn = false
-                    VoiceManagerUtil.switchAudioMode(activity, false)
-                    VoiceManagerUtil.setCallVoice(activity, SettingConfig.getHostCallVolume(activity))
+                    //VoiceManagerUtil.setCallVoice(activity, SettingConfig.getHostCallVolume(activity))
 
                     EventBus.getDefault().post(MessageEvent("hookoff", Constants.EVENT_HOOK_OFF))
                 }

+ 1 - 0
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/di/NurseHomeComponent.kt

@@ -17,6 +17,7 @@ interface NurseHomeComponent{
     fun inject(activity: NurseHomeActivity)
     fun inject(activity: SipHomeActivity)
 
+    fun inject(fragment: HomeCallFragment)
     fun inject(fragment: HomeFragment)
     fun inject(fragment: FramePartFragment)
     fun inject(fragment: BroadcastFragment)

+ 78 - 89
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/DeviceManageFragment.kt

@@ -1,16 +1,18 @@
 package com.wdkl.ncs.android.component.nursehome.fragment
 
+import android.content.Intent
+import android.os.Build
+import android.provider.Settings
 import android.view.View
 import com.alibaba.android.vlayout.DelegateAdapter
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.enation.javashop.net.engine.model.NetState
+import com.wdkl.ncs.android.component.nursehome.BuildConfig
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.adapter.ExtensionDeviceAdapter
 import com.wdkl.ncs.android.component.nursehome.databinding.FragmentDeviceManageBinding
 import com.wdkl.ncs.android.component.nursehome.launch.NurseHomeLaunch
-import com.wdkl.ncs.android.component.nursehome.util.AppUpdateHelper
-import com.wdkl.ncs.android.component.nursehome.util.AppUtil
-import com.wdkl.ncs.android.component.nursehome.util.NetHelper
+import com.wdkl.ncs.android.component.nursehome.util.*
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.db.DeviceBean
@@ -19,12 +21,14 @@ import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.helper.ConfirmDialogHelper
 import com.wdkl.ncs.android.middleware.helper.ExtensionSipDialogHelper
+import com.wdkl.ncs.android.middleware.helper.PassCheckDialogHelper
 import com.wdkl.ncs.android.middleware.helper.SipDialogHelper
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.OtherHostContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.OtherHostPresenter
 import com.wdkl.ncs.android.middleware.model.dos.DeviceDO
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
+import com.wdkl.ncs.host.activity.SipTestActivity
 import kotlinx.android.synthetic.main.fragment_device_manage.*
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -32,12 +36,8 @@ import org.greenrobot.eventbus.ThreadMode
 class DeviceManageFragment : BaseFragment<OtherHostPresenter, FragmentDeviceManageBinding>(), OtherHostContract.View, View.OnClickListener {
     var TAG = DeviceManageFragment::class.java.getSimpleName()
 
-    private lateinit var virtualLayoutManager: VirtualLayoutManager
-    private lateinit var delegateAdapter: DelegateAdapter
-
-    var deviceAdapter: ExtensionDeviceAdapter? = null
-
-    private var selectDevice: DeviceBean? = null
+    private var clickTime: Long = 0
+    private var clickTimes: Int = 1
 
     /**
      * 提供layoutID
@@ -57,30 +57,32 @@ class DeviceManageFragment : BaseFragment<OtherHostPresenter, FragmentDeviceMana
      *初始化操作
      */
     override fun init() {
-        /**初始化LayoutMannager*/
-        virtualLayoutManager = VirtualLayoutManager(this.activity)
-        /**初始化适配器*/
-        delegateAdapter = DelegateAdapter(virtualLayoutManager)
-
-        deviceAdapter = ExtensionDeviceAdapter(ArrayList(), 2)
-        delegateAdapter.addAdapter(deviceAdapter)
-
-        /**配置到RecycleView*/
-        rv_extension_devices.layoutManager = virtualLayoutManager
-        rv_extension_devices.adapter = delegateAdapter
 
         rb_host_device.isChecked = true
-        tv_host_sip.setText("本机sip账号: " + Constants.sip_id + "@" + NetHelper.getInstance().localIP)
-    }
+        tv_host_sip.setText("本机SIP: " + Constants.sip_id + "@" + NetHelper.getInstance().localIP)
+
+        tv_app_version_name.setText("Version: V" + BuildConfig.VERSION_NAME + "_" + BuildConfig.VERSION_CODE)
+        tv_app_version_name.setOnClickListener {
+            val time = System.currentTimeMillis()
+            if (time - clickTime < 1500) {
+                clickTimes++
+            } else {
+                clickTimes = 1
+            }
 
-    private fun loadDevices() {
-        //加载数据
-        val devices = BaseApplication.daoSession?.deviceBeanDao?.loadAll()
-        if (devices != null && devices.size > 0) {
-            deviceAdapter?.data?.clear()
-            deviceAdapter?.data?.addAll(devices)
-            deviceAdapter?.notifyDataSetChanged()
+            if (clickTimes > 9) {
+                if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F")) {
+                    AppUtil.openNetworkDebug()
+                } else {
+                    showMessage("do not support debug")
+                }
+                clickTimes = 1
+            }
+            clickTime = time
         }
+
+        tv_device_ip_address.setText(NetHelper.getInstance().localIP)
+        tv_device_sip_name.setText("sip: " + Constants.sip_id)
     }
 
     /**
@@ -94,35 +96,17 @@ class DeviceManageFragment : BaseFragment<OtherHostPresenter, FragmentDeviceMana
             } else if (checkedId == R.id.rb_extension_device) {
                 ll_host_device.visibility = View.GONE
                 ll_extension_devices.visibility = View.VISIBLE
-
-                loadDevices()
-
-                selectDevice = null
-                tv_select_device.text = ""
-            }
-        }
-
-        btn_config.setOnClickListener {
-            SipDialogHelper.showDialog(activity, CommonUtils.getSipAccount(activity)) {
-                CommonUtils.setSipAccount(BaseApplication.appContext, it)
-
-                showMessage("修改成功,即将重启")
-                AppTool.Time.delay(1500) {
-                    AppUpdateHelper.restartApp(activity)
-                }
+                tv_target_device_sip.setText("对方SIP: " + CommonUtils.getTargetSipId(BaseApplication.appContext)
+                        + "@" + CommonUtils.getTargetSipIP(BaseApplication.appContext))
             }
         }
 
-        deviceAdapter?.setOnItemClickListener { data, position ->
-            selectDevice = data
 
-            tv_select_device.text = "账号: " + data.sipId + "\nIP: " + data.sipIp
-        }
-
-
-        btn_add_device.setOnClickListener(this)
+        btn_host_ip_config.setOnClickListener(this)
         btn_config_device.setOnClickListener(this)
-        btn_delete_device.setOnClickListener(this)
+        tv_system_settings.setOnClickListener(this)
+        tv_restart.setOnClickListener(this)
+        tv_sip_test.setOnClickListener(this)
     }
 
     /**
@@ -169,51 +153,56 @@ class DeviceManageFragment : BaseFragment<OtherHostPresenter, FragmentDeviceMana
 
     override fun onClick(p0: View?) {
         when (p0?.id) {
-            R.id.btn_add_device -> {
-                ExtensionSipDialogHelper.showDialog(activity, "", ""
-                ) { strId, strIp ->
-                    val device = DeviceBean()
-                    device.createTime = System.currentTimeMillis()
-                    device.name = "Extension"
-                    device.sipId = strId
-                    device.sipIp = strIp
-                    BaseApplication.daoSession?.deviceBeanDao?.insert(device)
-
-                    showMessage("添加成功")
-                    //重新加载
-                    loadDevices()
+            R.id.btn_host_ip_config -> {
+                //修改本机sip
+                SipDialogHelper.showDialog(activity, CommonUtils.getSipAccount(activity)) {
+                    CommonUtils.setSipAccount(BaseApplication.appContext, it)
+
+                    showMessage("修改成功,即将重启")
+                    AppTool.Time.delay(1500) {
+                        AppUpdateHelper.restartApp(activity)
+                    }
                 }
             }
 
             R.id.btn_config_device -> {
-                if (selectDevice != null) {
-                    ExtensionSipDialogHelper.showDialog(activity, selectDevice?.sipId, selectDevice?.sipIp
-                    ) { strId, strIp ->
-                        selectDevice?.sipId = strId
-                        selectDevice?.sipIp = strIp
-                        BaseApplication.daoSession?.deviceBeanDao?.update(selectDevice)
-
-                        showMessage("修改成功")
-                        //重新加载
-                        loadDevices()
-                    }
-                } else {
-                    showMessage("请先选择设备")
+                //修改对方sip
+                val id = CommonUtils.getTargetSipId(BaseApplication.appContext)
+                val ip = CommonUtils.getTargetSipIP(BaseApplication.appContext)
+                ExtensionSipDialogHelper.showDialog(activity, id, ip
+                ) { strId, strIp ->
+
+                    CommonUtils.setTargetSipId(BaseApplication.appContext, strId)
+                    CommonUtils.setTargetSipIP(BaseApplication.appContext, strIp)
+                    showMessage("修改成功")
+
+                    tv_target_device_sip.setText("对方SIP: " + CommonUtils.getTargetSipId(BaseApplication.appContext)
+                            + "@" + CommonUtils.getTargetSipIP(BaseApplication.appContext))
                 }
             }
 
-            R.id.btn_delete_device -> {
-                if (selectDevice != null) {
-                    val tips = "确认删除?\n" + AppUtil.parseCallNameByCode(selectDevice?.sipId)
-                    ConfirmDialogHelper.showDialog(activity, tips) {
-                        BaseApplication.daoSession?.deviceBeanDao?.delete(selectDevice)
+            R.id.tv_system_settings -> {
+                PassCheckDialogHelper.showDialog(activity) {
+                    val intent = Intent(Settings.ACTION_SETTINGS)
+                    startActivity(intent)
 
-                        showMessage("删除成功")
-                        //重新加载
-                        loadDevices()
+                    if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+                        StatusBarHelper.toggleStatusBar(activity, true)
                     }
-                } else {
-                    showMessage("请先选择设备")
+                }
+            }
+
+            R.id.tv_restart -> {
+                PassCheckDialogHelper.showDialog(activity) {
+                    AppUpdateHelper.restartApp(BaseApplication.appContext)
+                }
+            }
+
+            R.id.tv_sip_test -> {
+                PasswordDialogHelper.showPasswordDialog(activity) {
+                    val intent = Intent()
+                    intent.setClass(context, SipTestActivity::class.java)
+                    startActivity(intent)
                 }
             }
         }

+ 119 - 0
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/HomeCallFragment.kt

@@ -0,0 +1,119 @@
+package com.wdkl.ncs.android.component.nursehome.fragment
+
+import android.text.TextUtils
+import com.enation.javashop.net.engine.model.NetState
+import com.wdkl.ncs.android.component.nursehome.R
+import com.wdkl.ncs.android.component.nursehome.databinding.FragmentHomeCallBinding
+import com.wdkl.ncs.android.component.nursehome.launch.NurseHomeLaunch
+import com.wdkl.ncs.android.lib.base.BaseApplication
+import com.wdkl.ncs.android.lib.base.BaseFragment
+import com.wdkl.ncs.android.lib.db.DeviceBean
+import com.wdkl.ncs.android.lib.utils.showMessage
+import com.wdkl.ncs.android.lib.vo.filter
+import com.wdkl.ncs.android.middleware.common.Constants
+import com.wdkl.ncs.android.middleware.logic.contract.nursehome.FramePartContract
+import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.FramePartPresenter
+import com.wdkl.ncs.android.middleware.model.vo.*
+import com.wdkl.ncs.android.middleware.utils.CommonUtils
+import com.wdkl.ncs.android.middleware.utils.MessageEvent
+import kotlinx.android.synthetic.main.fragment_home_call.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+class HomeCallFragment: BaseFragment<FramePartPresenter, FragmentHomeCallBinding>(), FramePartContract.View {
+    var TAG = HomeCallFragment::class.java.getSimpleName()
+
+    private var clickTime: Long = 0
+
+    override fun getLayId(): Int {
+        return R.layout.fragment_home_call
+    }
+
+    override fun bindDagger() {
+        NurseHomeLaunch.component.inject(this)
+    }
+
+    override fun init() {
+
+    }
+
+    override fun bindEvent() {
+
+        sip_call_voice.setOnClickListener {
+            if (System.currentTimeMillis() - clickTime < 3000) {
+                showMessage(R.string.call_wait)
+            } else {
+                val sipId = CommonUtils.getTargetSipId(BaseApplication.appContext)
+                val sipIp = CommonUtils.getTargetSipIP(BaseApplication.appContext)
+                if (!TextUtils.isEmpty(sipId) && !TextUtils.isEmpty(sipIp)) {
+                    val targetDevice = DeviceBean()
+                    targetDevice.sipId = sipId
+                    targetDevice.sipIp = sipIp
+                    EventBus.getDefault().post(MessageEvent(targetDevice, Constants.SIP_OUTGOING_VOICE_CALL))
+                } else {
+                    showMessage("呼叫设备数据异常!")
+                }
+
+                clickTime = System.currentTimeMillis()
+            }
+        }
+
+        sip_call_video.setOnClickListener {
+            if (System.currentTimeMillis() - clickTime < 3000) {
+                showMessage(R.string.call_wait)
+            } else {
+                val sipId = CommonUtils.getTargetSipId(BaseApplication.appContext)
+                val sipIp = CommonUtils.getTargetSipIP(BaseApplication.appContext)
+                if (!TextUtils.isEmpty(sipId) && !TextUtils.isEmpty(sipIp)) {
+                    val targetDevice = DeviceBean()
+                    targetDevice.sipId = sipId
+                    targetDevice.sipIp = sipIp
+                    EventBus.getDefault().post(MessageEvent(targetDevice, Constants.SIP_OUTGOING_VIDEO_CALL))
+                } else {
+                    showMessage("呼叫设备数据异常!")
+                }
+
+                clickTime = System.currentTimeMillis()
+            }
+        }
+
+    }
+
+    override fun showCustomerInfo(data: CustomerInfoVO) {
+
+    }
+
+    override fun destory() {
+
+    }
+
+    override fun onError(message: String, type: Int) {
+
+    }
+
+    override fun start() {
+    }
+
+    override fun showData(data: FramePartVO) {
+
+    }
+
+    override fun complete(message: String, type: Int) {
+    }
+
+    override fun networkMonitor(state: NetState) {
+        state.filter(onWifi = {
+
+        },onMobile = {
+
+        },offline = {
+
+        })
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onMoonEvent(messageEvent: MessageEvent) {
+
+    }
+}

+ 60 - 7
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/SipComingCallFragment.kt

@@ -3,12 +3,10 @@ package com.wdkl.ncs.android.component.nursehome.fragment
 import android.os.*
 import android.util.Log
 import android.view.View
+import android.widget.SeekBar
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.settingconfig.SettingConfig
-import com.wdkl.ncs.android.component.nursehome.util.AppUtil
-import com.wdkl.ncs.android.component.nursehome.util.RingPlayHelper
-import com.wdkl.ncs.android.component.nursehome.util.SpeechUtil
-import com.wdkl.ncs.android.component.nursehome.util.Util
+import com.wdkl.ncs.android.component.nursehome.util.*
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constants
@@ -31,6 +29,7 @@ class SipComingCallFragment: BaseCallFragment() {
     lateinit var countDownTimer: CountDownTimer
 
     private var sipCore: Core? = null
+    private var volume = 60
 
     override fun getLayId(): Int {
         return R.layout.sip_call_layout
@@ -43,12 +42,21 @@ class SipComingCallFragment: BaseCallFragment() {
         sipCore?.setNativePreviewWindowId(local_video_frame)
         sipCore?.setNativeVideoWindowId(remote_video_frame)
 
+        volume = SettingConfig.getHostCallVolume(activity)
+        if (volume < 0 || volume > 100) {
+            volume = 60
+        }
+        call_volume_bar.progress = volume/10
+        tv_volume.text = "" + volume/10
+        VoiceManagerUtil.setCallVoice(activity, volume)
+        sipCore?.enableMic(true)
+
         when (callState) {
             0 -> {
                 //发起通话
                 outGoing = true
                 showCallView(true)
-                RingPlayHelper.playRingTone(BaseApplication.appContext, R.raw.ring_back2, true)
+                //RingPlayHelper.playRingTone(BaseApplication.appContext, R.raw.ring_back2, true)
 
                 startSipCall()
             }
@@ -59,6 +67,8 @@ class SipComingCallFragment: BaseCallFragment() {
                 showCallView(false)
             }
         }
+
+        VoiceManagerUtil.switchAudioMode(activity, Constants.hookOn)
     }
 
     private fun initCountDownTimer() {
@@ -112,6 +122,46 @@ class SipComingCallFragment: BaseCallFragment() {
 
             button_call.isEnabled = false
         }*/
+
+
+        sky_voice_call_mute.setOnClickListener {
+            val micEnable = sipCore!!.micEnabled()
+            Log.d(TAG,"mic enable: $micEnable")
+
+            if (micEnable) {
+                sipCore!!.enableMic(false)
+                sky_voice_call_mute.isSelected = true
+            } else {
+                sipCore!!.enableMic(true)
+                sky_voice_call_mute.isSelected = false
+            }
+        }
+
+        call_volume_bar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener{
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                tv_volume.text = "" + progress
+                if (seekBar!!.progress <= 1) {
+                    tv_volume.text = "1"
+                } else {
+                    tv_volume.text = "" + progress
+                }
+            }
+
+            override fun onStartTrackingTouch(seekBar: SeekBar?) {
+                //
+            }
+
+            override fun onStopTrackingTouch(seekBar: SeekBar?) {
+                val vol: Int
+                if (seekBar!!.progress <= 2) {
+                    vol = 20
+                } else {
+                    vol = seekBar.progress*10
+                }
+                VoiceManagerUtil.setCallVoice(activity, vol)
+                SettingConfig.setHostCallVolume(activity, vol)
+            }
+        })
     }
 
     private fun startSipCall() {
@@ -121,7 +171,7 @@ class SipComingCallFragment: BaseCallFragment() {
         params?.enableVideo(!onlyAudio)
 
         //录音文件路径
-        params?.recordFile = Environment.getExternalStorageDirectory().path + "/" + Environment.DIRECTORY_DOWNLOADS + "/" + AppUtil.getTimeFilename() + ".wav"
+        //params?.recordFile = Environment.getExternalStorageDirectory().path + "/" + Environment.DIRECTORY_DOWNLOADS + "/" + AppUtil.getTimeFilename() + ".wav"
 
         if (addressToCall != null) {
             sipCore?.inviteAddressWithParams(addressToCall, params!!)
@@ -142,7 +192,7 @@ class SipComingCallFragment: BaseCallFragment() {
             }
 
             //录音文件路径
-            params?.recordFile = Environment.getExternalStorageDirectory().path + "/" + Environment.DIRECTORY_DOWNLOADS + "/" + AppUtil.getTimeFilename() + ".wav"
+            //params?.recordFile = Environment.getExternalStorageDirectory().path + "/" + Environment.DIRECTORY_DOWNLOADS + "/" + AppUtil.getTimeFilename() + ".wav"
             call?.acceptWithParams(params)
         }
     }
@@ -216,6 +266,8 @@ class SipComingCallFragment: BaseCallFragment() {
         sky_voice_call_timer.visibility = View.VISIBLE
         sky_voice_call_timer.base = SystemClock.elapsedRealtime()
         sky_voice_call_timer.start()
+        sky_voice_call_mute.visibility = View.VISIBLE
+        ll_voice_volume_bar.visibility = View.VISIBLE
     }
 
     //通话结束
@@ -264,6 +316,7 @@ class SipComingCallFragment: BaseCallFragment() {
             }
 
             Constants.SIP_CONNECTED -> {
+                sipCore!!.enableMic(true)
                 showCalling(onlyAudio)
             }
 

+ 2 - 2
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/SystemSettingsFragment.kt

@@ -264,7 +264,7 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
             }
 
             if (clickTimes > 9) {
-                if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F")) {
+                if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F")) {
                     openNetwrokDebug()
                 } else {
                     showMessage("do not support debug")
@@ -490,7 +490,7 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
                     val intent = Intent(Settings.ACTION_SETTINGS)
                     startActivity(intent)
 
-                    if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
+                    if (Build.BOARD.equals("k37tv1_64_bsp") || Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F") || "m3520b_bnkj_zx".equals(Build.MODEL)) {
                         StatusBarHelper.toggleStatusBar(activity, true)
                     }
                 }

+ 1 - 1
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/settingconfig/SettingConfig.java

@@ -155,7 +155,7 @@ public class SettingConfig {
 
     //语音播报模式
     public static int getTtsMode(Context context) {
-        return getSP(context).getInt(KEY_SP_TTS_MODE, TTS_ON);
+        return getSP(context).getInt(KEY_SP_TTS_MODE, TTS_OFF);
     }
 
     public static void setTtsMode(Context context, int mode) {

+ 22 - 0
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/util/AppUtil.java

@@ -136,4 +136,26 @@ public class AppUtil {
         alarmManager.setTimeZone(timeZone);
         alarmManager.setTime(timeMills);
     }
+
+    //开启网络调试
+    public static boolean openNetworkDebug() {
+        try {
+            Process process = Runtime.getRuntime().exec("su");
+            if (null == process) {
+                return false;
+            }
+            DataOutputStream os = new DataOutputStream(process.getOutputStream());
+            os.writeBytes("setprop service.adb.tcp.port 5555\n");
+            os.writeBytes("stop adbd\n");
+            os.writeBytes("start adbd\n");
+            os.writeBytes("exit\n");
+            os.flush();
+
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return false;
+    }
 }

+ 1 - 1
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/util/RingPlayHelper.java

@@ -26,7 +26,7 @@ public class RingPlayHelper {
         if (!ringPlayer.isPlay()) {
             ringPlayer.play(context, res, loop, AudioManager.STREAM_MUSIC);
             handler.removeCallbacksAndMessages(null);
-            handler.sendEmptyMessageDelayed(10, 30000);
+            handler.sendEmptyMessageDelayed(10, 60000);
         }
     }
 

BIN
android_host/src/main/h10_wke_1h/res/drawable/ic_home_new.png


BIN
android_host/src/main/h10_wke_1h/res/drawable/ic_settings_new.png


BIN
android_host/src/main/h10_wke_1h/res/drawable/ic_video_callout.png


BIN
android_host/src/main/h10_wke_1h/res/drawable/ic_voice_callout.png


BIN
android_host/src/main/h10_wke_1h/res/drawable/main_bg_1280x800.jpg


BIN
android_host/src/main/h10_wke_1h/res/drawable/main_bg_800x1280.png


+ 6 - 0
android_host/src/main/h10_wke_1h/res/drawable/round_button.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#0081ff"/>
+    <size android:width="100dp" android:height="100dp"/>
+</shape>

+ 25 - 0
android_host/src/main/h10_wke_1h/res/drawable/seek_bar_bg.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="4dp" />
+            <solid android:color="#ECF0F1" />
+        </shape>
+    </item>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <corners android:radius="4dp" />
+                <solid android:color="#C6CACE" />
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <corners android:radius="4dp" />
+                <solid android:color="#FF8C00" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>

+ 14 - 0
android_host/src/main/h10_wke_1h/res/drawable/seek_bar_thumb.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <!-- solid表示远的填充色 -->
+    <solid android:color="#FF8C00" />
+    <!-- stroke则代表远的边框线 -->
+    <stroke
+        android:width="1dp"
+        android:color="#FF8C00" />
+    <!-- size控制高宽 -->
+    <size
+        android:width="24dp"
+        android:height="24dp" />
+</shape>

+ 2 - 2
android_host/src/main/h10_wke_1h/res/drawable/selector_button_text_color.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#ffffff" android:state_pressed="true"/>
+    <item android:color="#000000" android:state_pressed="true"/>
     <item android:color="#B4B4B4" android:state_enabled="false"/>
-    <item android:color="#000000"/>
+    <item android:color="#ffffff"/>
 </selector>

+ 471 - 0
android_host/src/main/h10_wke_1h/res/layout-land/activity_nurse_home.xml

@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/javashop_color_white">
+
+            <RelativeLayout
+                android:id="@+id/title_relayout"
+                android:layout_width="match_parent"
+                android:layout_height="48dp">
+
+                <!--SIP状态图标-->
+                <TextView
+                    android:id="@+id/view_title_layout_tv_point"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:layout_marginLeft="10dp"
+                    android:textColor="@color/white"
+                    android:background="@color/red_color"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/name_of_organization_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@id/view_title_layout_tv_point"
+                    android:gravity="center"
+                    android:text="----"
+                    android:textColor="#2F9DF1"
+                    android:textSize="22sp" />
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:format12Hour="yyyy-MM-dd HH:mm EEEE"
+                    android:format24Hour="yyyy-MM-dd HH:mm EEEE"
+                    android:textColor="#2F9DF1"
+                    android:textSize="22sp" />
+
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            android:id="@+id/tv_device_id"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="16dp"
+                            android:text="ID: --"
+                            android:textColor="#2F9DF1"
+                            android:textSize="20sp"/>
+
+                        <ImageView
+                            android:id="@+id/battery_state_img"
+                            android:layout_width="28dp"
+                            android:layout_height="28dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginRight="10dp"
+                            android:src="@drawable/wdkl_stat_sys_battery"/>
+
+                        <!--   蓝牙状态  -->
+                        <ImageView
+                            android:id="@+id/bluetooth_state_imagev"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="16dp"
+                            android:visibility="gone"/>
+                        <!--   WiFi状态  -->
+                        <ImageView
+                            android:id="@+id/wifi_state_imagev"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="16dp" />
+
+                        <!-- 以太网 -->
+                        <ImageView
+                            android:id="@+id/ethernet_state_imagev"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="16dp" />
+
+                        <!--   tcp连接状态  -->
+                        <ImageView
+                            android:id="@+id/tcp_state_imagev"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="16dp"
+                            android:src="@drawable/ic_tcp_fail"/>
+
+                        <!--白昼状态-->
+                        <ImageView
+                            android:id="@+id/day_night_state_imagev"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="16dp" />
+
+                    </LinearLayout>
+                </RelativeLayout>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_above="@+id/bottom_linlyout"
+                android:layout_below="@+id/title_relayout">
+
+                <FrameLayout
+                    android:id="@+id/left_framlyout"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.23"
+                    android:visibility="gone"/>
+
+
+                <FrameLayout
+                    android:id="@+id/middle_fralyout"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_toRightOf="@+id/left_framlyout"
+                    android:layout_weight="0.77"/>
+
+            </LinearLayout>
+            <FrameLayout
+                android:id="@+id/right_fralyout"
+                android:layout_width="480dp"
+                android:layout_height="match_parent"
+                android:layout_above="@+id/bottom_linlyout"
+                android:layout_below="@+id/title_relayout"
+                android:layout_alignParentRight="true"/>
+
+            <LinearLayout
+                android:id="@+id/bottom_linlyout"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_alignParentBottom="true"
+                android:background="#2F9DF1"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
+
+                    <RadioGroup
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/home_radio_bt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/shou_ye_no"
+                            android:drawablePadding="10px"
+                            android:gravity="center"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:text="@string/str_home"
+                            android:textSize="24sp" />
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/sip_call_radio_bt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/guang_bo"
+                            android:drawablePadding="10px"
+                            android:gravity="center"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:text="呼叫"
+                            android:textSize="24sp" />
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/broadcast_radio_bt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/guang_bo"
+                            android:drawablePadding="10px"
+                            android:gravity="center"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:text="@string/str_broadcast"
+                            android:textSize="24sp"
+                            android:visibility="gone"/>
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/visit_an_extension_radio_bt"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/selt_broadcast_icon"
+                            android:gravity="center"
+                            android:textColor="#FFFFFF"
+                            android:text="@string/str_visiting"
+                            android:textSize="16sp"
+                            android:visibility="gone" />
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/doctor_host_radio_bt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/ic_doctor"
+                            android:drawablePadding="10px"
+                            android:gravity="center"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:text="@string/str_doctor"
+                            android:textSize="24sp"
+                            android:visibility="gone"/>
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/inpatient_ward_radio_bt"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/selt_inpatient_ward_icon"
+                            android:gravity="center"
+                            android:textColor="#FFFFFF"
+                            android:text="@string/str_ward"
+                            android:textSize="16sp"
+                            android:visibility="gone" />
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/sickbed_radio_bt"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/selt_broadcast_icon"
+                            android:gravity="center"
+                            android:textColor="#FFFFFF"
+                            android:text="@string/str_sick_bed"
+                            android:textSize="16sp"
+                            android:visibility="gone" />
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/nurse_move_radio_bt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/selt_move_icon"
+                            android:drawablePadding="10px"
+                            android:gravity="center"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:text="@string/str_mobile"
+                            android:textSize="24sp"
+                            android:visibility="gone"/>
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/other_host_radio_bt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/selt_other_host_icon"
+                            android:drawablePadding="10px"
+                            android:gravity="center"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:text="@string/str_other_host"
+                            android:textSize="24sp"
+                            android:visibility="gone"/>
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/collocation_radio_bt"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/selt_broadcast_icon"
+                            android:gravity="center"
+                            android:textColor="#FFFFFF"
+                            android:text="@string/str_trusteeship"
+                            android:textSize="16sp"
+                            android:visibility="gone" />
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/led_settings_radio_bt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/selt_set_icon"
+                            android:drawablePadding="10px"
+                            android:gravity="center"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:text="@string/str_led"
+                            android:textSize="24sp"
+                            android:visibility="gone"/>
+
+                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                            android:id="@+id/system_settings_radio_bt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:button="@null"
+                            android:drawableLeft="@drawable/selt_set_icon"
+                            android:drawablePadding="10px"
+                            android:gravity="center"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:text="@string/str_settings"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="5"/>
+
+                    </RadioGroup>
+                </LinearLayout>
+            </LinearLayout>
+
+        <!--通话界面-->
+        <FrameLayout
+            android:id="@+id/call_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <!--注册界面-->
+        <LinearLayout
+            android:id="@+id/ll_register_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:gravity="center_horizontal">
+
+            <ImageView
+                android:id="@+id/home_view_qr_code"
+                android:layout_marginTop="10dp"
+                android:layout_width="280dp"
+                android:layout_height="280dp"
+                android:layout_gravity="center_horizontal" />
+
+            <TextView
+                android:id="@+id/home_view_device_model"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="rom:"
+                android:textColor="@color/black"
+                android:textSize="20sp"
+                android:visibility="gone"/>
+
+            <TextView
+                android:id="@+id/home_view_local_ip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="IP:"
+                android:textColor="@color/black"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/home_view_local_mac"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="MAC:"
+                android:textColor="@color/black"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/home_view_local_imei"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="IMEI:"
+                android:textColor="@color/black"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/home_view_app_version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="App version:"
+                android:textColor="@color/black"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/home_view_mcu_version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="MCU:"
+                android:textColor="@color/black"
+                android:textSize="20sp"
+                android:visibility="gone"/>
+
+            <TextView
+                android:id="@+id/home_view_device_state"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:textColor="@color/black"
+                android:textSize="20sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:gravity="center">
+                <Button
+                    android:id="@+id/btn_get_server"
+                    android:layout_width="140dp"
+                    android:layout_height="wrap_content"
+                    android:background="#2F9DF1"
+                    android:text="@string/register_auto_config"
+                    android:textSize="20sp"
+                    android:visibility="gone"/>
+
+                <Button
+                    android:id="@+id/btn_set_language"
+                    android:layout_width="140dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:background="#2F9DF1"
+                    android:text="@string/language_settings"
+                    android:textSize="20sp" />
+
+                <Button
+                    android:id="@+id/btn_set_server"
+                    android:layout_width="140dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:background="#2F9DF1"
+                    android:text="@string/server_config"
+                    android:textSize="20sp" />
+
+                <Button
+                    android:id="@+id/home_view_btn_reload"
+                    android:layout_width="140dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:background="#2F9DF1"
+                    android:text="@string/register_reload"
+                    android:textSize="20sp" />
+
+                <Button
+                    android:id="@+id/btn_reboot"
+                    android:layout_width="140dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:background="#2F9DF1"
+                    android:text="@string/register_reboot"
+                    android:textSize="20sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</layout>

+ 66 - 0
android_host/src/main/h10_wke_1h/res/layout-land/activity_register.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="10dp"
+        android:background="@color/white"
+        android:orientation="vertical"
+        android:gravity="center">
+
+        <TextView
+            android:id="@+id/tv_sip_account"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="SIP:"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/tv_local_ip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="IP:"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/tv_local_mac"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="MAC:"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/tv_local_imei"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="IMEI:"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/tv_app_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="App version:"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <Button
+            android:id="@+id/btn_config_sip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:padding="10dp"
+            android:background="@drawable/selector_button_bg_color2"
+            android:text="SIP配置"
+            android:textSize="24sp"/>
+    </LinearLayout>
+</layout>

+ 175 - 0
android_host/src/main/h10_wke_1h/res/layout-land/activity_sip_home.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/javashop_color_white">
+
+        <RelativeLayout
+            android:id="@+id/title_relayout"
+            android:layout_width="match_parent"
+            android:layout_height="60dp">
+
+            <TextView
+                android:id="@+id/sip_name"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="10dp"
+                android:gravity="center"
+                android:text="sip:"
+                android:textColor="#2F9DF1"
+                android:textSize="28sp" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:format12Hour="yyyy-MM-dd HH:mm EEEE"
+                android:format24Hour="yyyy-MM-dd HH:mm EEEE"
+                android:textColor="#2F9DF1"
+                android:textSize="26sp" />
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:gravity="center">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/battery_state_img"
+                        android:layout_width="28dp"
+                        android:layout_height="28dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="10dp"
+                        android:src="@drawable/wdkl_stat_sys_battery" />
+
+                    <!--   蓝牙状态  -->
+                    <ImageView
+                        android:id="@+id/bluetooth_state_imagev"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="16dp"
+                        android:visibility="gone" />
+                    <!--   WiFi状态  -->
+                    <ImageView
+                        android:id="@+id/wifi_state_imagev"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="16dp" />
+
+                    <!-- 以太网 -->
+                    <ImageView
+                        android:id="@+id/ethernet_state_imagev"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="16dp" />
+
+                </LinearLayout>
+            </RelativeLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottom_linlyout"
+            android:layout_below="@+id/title_relayout">
+
+            <FrameLayout
+                android:id="@+id/middle_fralyout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </LinearLayout>
+
+        <!--<FrameLayout
+            android:id="@+id/right_fralyout"
+            android:layout_width="480dp"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottom_linlyout"
+            android:layout_below="@+id/title_relayout"
+            android:layout_alignParentRight="true"/>-->
+
+        <LinearLayout
+            android:id="@+id/bottom_linlyout"
+            android:layout_width="match_parent"
+            android:layout_height="68dp"
+            android:layout_alignParentBottom="true"
+            android:background="#2F9DF1"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <RadioGroup
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
+
+                    <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                        android:id="@+id/home_radio_bt"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/ic_home_new"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:text="@string/str_home"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+                        android:textSize="28sp" />
+
+                    <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                        android:id="@+id/sip_device_radio_bt"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/ic_settings_new"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:text="设置"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+                        android:textSize="28sp" />
+
+                    <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                        android:id="@+id/system_settings_radio_bt"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/selt_set_icon"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:text="@string/str_settings"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+                        android:textSize="28sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5" />
+
+                </RadioGroup>
+            </LinearLayout>
+        </LinearLayout>
+
+        <!--通话界面-->
+        <FrameLayout
+            android:id="@+id/call_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </RelativeLayout>
+
+</layout>

+ 106 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_broadcast.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/sound_recording_linlyout"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="vertical"
+            >
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/serial_number_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="1"
+                    android:textSize="5dp" />
+
+                <TextView
+                    android:id="@+id/filename_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="3dp"
+                    android:layout_toRightOf="@+id/serial_number_tv"
+                    android:text="录音"
+                    android:textSize="5dp" />
+
+                <TextView
+                    android:id="@+id/duration_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@+id/filename_tv"
+                    android:layout_marginLeft="5dp"
+                    android:text="30s"
+                    android:textSize="5dp" />
+                <TextView
+                    android:id="@+id/time_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text="2002-03-28 12:12:23"
+                    android:textSize="5dp" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/delete_bt"
+                        android:layout_width="20dp"
+                        android:layout_height="15dp"
+                        android:text="删除"
+                        android:textSize="5dp" />
+
+                    <Button
+                        android:id="@+id/audition_bt"
+                        android:layout_width="20dp"
+                        android:layout_height="15dp"
+                        android:text="试听"
+                        android:textSize="5dp" />
+
+                    <Button
+                        android:id="@+id/play_bt"
+                        android:layout_width="20dp"
+                        android:layout_height="15dp"
+                        android:text="播放"
+                        android:textSize="5dp" />
+
+                    <Button
+                        android:id="@+id/suspend_bt"
+                        android:layout_width="20dp"
+                        android:layout_height="15dp"
+                        android:text="暂停"
+                        android:textSize="5dp" />
+
+                    <Button
+                        android:id="@+id/set_bt"
+                        android:layout_width="20dp"
+                        android:layout_height="15dp"
+                        android:text="设置"
+                        android:textSize="5dp" />
+
+                </LinearLayout>
+            </RelativeLayout>
+
+        </LinearLayout>
+
+
+    </RelativeLayout>
+</layout>

+ 176 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_call_records_item.xml

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="96dp"
+        android:background="#ffffff"
+        android:layout_marginTop="6dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp">
+
+        <LinearLayout
+            android:id="@+id/tab_linyout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_centerVertical="true"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/tab_imagev"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/lai_dian_tou_xiang_bg" />
+
+            <ImageView
+                android:id="@+id/call_status_imagev"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:src="@drawable/hu_ru_wei_jie" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginRight="10dp"
+            android:layout_toRightOf="@+id/tab_linyout">
+
+            <RelativeLayout
+                android:id="@+id/room_name_linlyout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp">
+
+                <TextView
+                    android:id="@+id/sickbed_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textSize="20sp"
+                    android:singleLine="true"
+                    android:ellipsize="end"/>
+
+                <TextView
+                    android:id="@+id/call_time_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text=""
+                    android:textSize="12sp"
+                    android:visibility="gone"/>
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/nursing_project_relalyout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/room_name_linlyout"
+                android:layout_marginTop="2dp"
+                android:layout_marginLeft="10dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textSize="20sp"
+                    android:singleLine="true"
+                    android:ellipsize="end"/>
+
+                <TextView
+                    android:id="@+id/call_list_reply"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:layout_alignParentRight="true"
+                    android:drawableLeft="@drawable/hu_jiao"
+                    android:drawablePadding="6dp"
+                    android:textSize="18sp"
+                    android:text="@string/call_record_replay" />
+
+                <TextView
+                    android:id="@+id/call_sos_reply"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="4dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/sp_event_unhandled_bg"
+                    android:textSize="16sp"
+                    android:text="@string/call_record_unhandled"/>
+
+                <TextView
+                    android:id="@+id/state_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="4dp"
+                    android:layout_alignParentRight="true"
+                    android:textSize="18sp"
+                    android:text="" />
+
+                <LinearLayout
+                    android:id="@+id/incident_linlyou"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                    <ImageView
+                        android:id="@+id/treatment_state_imagev"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="6dp"
+                        android:src="@drawable/yi_chu_li" />
+
+
+                    <TextView
+                        android:id="@+id/project_tv"
+                        android:layout_width="60dp"
+                        android:layout_height="20dp"
+                        android:gravity="center"
+                        android:text=""
+                        android:background="@drawable/sp_event_handled"
+                        android:textSize="12sp" />
+
+                    <ImageView
+                        android:id="@+id/play_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/wei_bo_fang"
+                        android:gravity="center" />
+
+                </LinearLayout>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/nursing_project_relalyout"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/conductor_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:text=""
+                    android:textSize="12sp"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/processing_time_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textSize="16sp" />
+            </LinearLayout>
+        </RelativeLayout>
+    </RelativeLayout>
+</layout>

+ 70 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_calling_item.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="120dp"
+    android:background="#ffffff"
+    android:layout_marginTop="6dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="7"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_calling_bed_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="8dp"
+            android:paddingTop="8dp"
+            android:textSize="22sp"
+            android:text="--"
+            android:singleLine="true"
+            android:ellipsize="end"/>
+
+        <TextView
+            android:id="@+id/tv_calling_custom_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="8dp"
+            android:paddingTop="8dp"
+            android:textSize="22sp"
+            android:text="--"
+            android:singleLine="true"
+            android:ellipsize="end"/>
+
+        <TextView
+            android:id="@+id/tv_calling_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="8dp"
+            android:paddingTop="4dp"
+            android:textSize="18sp"
+            android:text="--:--"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="3"
+        android:orientation="vertical"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/btn_call_accept"
+            android:layout_width="68dp"
+            android:layout_height="68dp"
+            android:padding="4dp"
+            android:src="@drawable/ic_answer_normal" />
+
+        <ImageView
+            android:id="@+id/btn_call_reject"
+            android:layout_width="68dp"
+            android:layout_height="68dp"
+            android:src="@drawable/ic_hangup_normal"
+            android:visibility="gone"/>
+    </LinearLayout>
+
+</LinearLayout>

+ 26 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_doctor_host.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="140dp"
+      android:layout_height="100dp"
+      android:padding="10dp"
+      android:background="@drawable/item_selector">
+
+    <ImageView
+        android:id="@+id/doctor_photo_imagev"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_gravity="center_vertical"
+        android:background="@drawable/ic_doctor_host" />
+
+    <TextView
+        android:id="@+id/doctor_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="10dp"
+        android:text="--"
+        android:textSize="24sp" />
+
+  </LinearLayout>
+</layout>

+ 61 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_event_list_item.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <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" />
+
+        <TextView
+            android:id="@+id/name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@+id/head_imagev"
+            android:gravity="center"
+            android:text="SOS"
+            android:textColor="@color/red_color"
+            android:textSize="36sp"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/incident_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@id/name_tv"
+            android:gravity="center"
+            android:textSize="32sp" />
+
+        <TextView
+            android:id="@+id/handle_imagev"
+            android:layout_width="80dp"
+            android:layout_height="40dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:gravity="center"
+            android:padding="4dp"
+            android:text="@string/str_confirm"
+            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>

+ 26 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_extension_device.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:padding="10dp"
+        android:background="@drawable/item_selector">
+
+        <ImageView
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/ic_other_host" />
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:textColor="@color/black"
+            android:text="--"
+            android:textSize="24sp" />
+
+    </LinearLayout>
+</layout>

+ 71 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_frame_bed_vos.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <RelativeLayout
+        android:layout_width="30dp"
+        android:layout_height="30dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/head_imagv"
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                android:background="#000000" />
+
+            <LinearLayout
+                android:id="@+id/data_linlayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/sex_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="2dp"
+                    android:text="性别"
+                    android:textSize="5dp" />
+
+                <TextView
+                    android:id="@+id/age_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="2dp"
+                    android:text="年龄"
+                    android:textSize="5dp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/name_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/data_linlayout"
+                android:gravity="center_horizontal"
+                android:text="老王"
+                android:textSize="8dp"
+                tools:ignore="NotSibling" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/bottom_relalyout"
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:layout_alignParentBottom="true">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="护理级别:特技"
+                android:textSize="4dp" />
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+</layout>

+ 39 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_frame_part_item.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:bind="http://schemas.android.com/apk/res-auto"
+xmlns:tools="http://schemas.android.com/tools"
+tools:ignore="MissingDefaultResource">
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:background="#ffffff">
+    <LinearLayout
+        android:id="@+id/sickroom_linlyout"
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/ward_imagv"
+            android:layout_width="10dp"
+            android:layout_height="10dp"
+            android:background="#000000"/>
+        <TextView
+            android:id="@+id/ward_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:textSize="8dp"
+            android:text="5房"/>
+
+    </LinearLayout>
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/sickbed_rev"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/sickroom_linlyout"
+        android:background="#800000"
+        >
+</android.support.v7.widget.RecyclerView>
+</RelativeLayout>
+</layout>

+ 103 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_hospital_frame_part.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/rl_bed_info"
+        android:layout_width="140dp"
+        android:layout_height="112dp"
+        android:background="@drawable/item_selector"
+        android:padding="4dp">
+
+        <LinearLayout
+            android:id="@+id/rl_nurse_item"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:layout_alignParentBottom="true">
+            <TextView
+                android:id="@+id/tv_nurse_config_name"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1.5"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="--"
+                android:textColor="@color/gray_deep"
+                android:textSize="14sp"/>
+
+            <TextView
+                android:id="@+id/tv_nurse_config_color"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:background="@color/color_gray"
+                android:textColor="@color/color_white"
+                android:textSize="12sp" />
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/rl_nurse_item"
+            android:padding="2dp">
+
+            <TextView
+                android:id="@+id/room_number_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="--"
+                android:textSize="18sp"
+                android:textColor="#2F9DF1"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/room_number_tv">
+
+                <ImageView
+                    android:id="@+id/patient_imagev"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:layout_marginTop="6dp"
+                    android:src="@drawable/kong_chuang" />
+
+                <TextView
+                    android:id="@+id/patient_name_tv"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:layout_marginTop="12dp"
+                    android:paddingLeft="6dp"
+                    android:singleLine="true"
+                    android:text="--"
+                    android:textSize="20sp"
+                    android:textColor="@color/black"/>
+
+                <TextView
+                    android:id="@+id/patient_age_tv"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:text="--"
+                    android:textSize="16sp"
+                    android:textColor="@color/black"/>
+
+                <ImageView
+                    android:id="@+id/sex_imagev"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_marginTop="20dp"
+                    android:src="@drawable/nv" />
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+</layout>

+ 25 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_inpatient_ward.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <CheckBox
+                android:id="@+id/check_box"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scaleX="0.4"
+                android:scaleY="0.4"
+                android:text="測試"
+
+                android:textSize="14dp" />
+
+        </LinearLayout>
+    </RelativeLayout>
+</layout>

+ 17 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_led_item.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="10dp"
+    android:background="#ffffff">
+
+    <TextView
+        android:id="@+id/tv_led_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="LED"
+        android:textSize="24sp"/>
+
+</LinearLayout>

+ 26 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_mobile_device.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="140dp"
+        android:layout_height="100dp"
+        android:padding="10dp"
+        android:background="@drawable/item_selector">
+
+        <ImageView
+            android:id="@+id/mobile_photo_imagev"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/ic_nurse_default" />
+
+        <TextView
+            android:id="@+id/mobile_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:text="--"
+            android:textSize="24sp" />
+
+    </LinearLayout>
+</layout>

+ 26 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_other_host.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="140dp"
+        android:layout_height="100dp"
+        android:padding="10dp"
+        android:background="@drawable/item_selector">
+
+        <ImageView
+            android:id="@+id/iv_other_host"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/ic_other_host" />
+
+        <TextView
+            android:id="@+id/tv_other_host"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:text="--"
+            android:textSize="24sp" />
+
+    </LinearLayout>
+</layout>

+ 16 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_responsibility_bed.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="80dp"
+        android:layout_height="40dp">
+
+        <TextView
+            android:id="@+id/responsibility_bed_tv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/responsible_bed_bg"
+            android:gravity="center"
+            android:text=""
+            android:textSize="16sp" />
+    </LinearLayout>
+</layout>

+ 76 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_sickbed.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="50dp"
+        android:layout_height="30dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/head_imagv"
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                android:background="#000000" />
+
+            <LinearLayout
+                android:id="@+id/data_linlayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:orientation="horizontal">
+                <TextView
+                    android:id="@+id/bed_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="2dp"
+                    android:text="5房3床"
+                    android:textSize="5dp" />
+                <TextView
+                    android:id="@+id/sex_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="2dp"
+                    android:text="性别"
+                    android:textSize="5dp" />
+
+                <TextView
+                    android:id="@+id/age_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="2dp"
+                    android:text="年龄"
+                    android:textSize="5dp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/name_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/data_linlayout"
+                android:gravity="center_horizontal"
+                android:text="老王"
+                android:textSize="8dp"
+                tools:ignore="NotSibling" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/bottom_relalyout"
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:layout_alignParentBottom="true">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="护理级别:特技"
+                android:textSize="4dp" />
+
+        </RelativeLayout>
+
+
+    </RelativeLayout>
+</layout>

+ 43 - 0
android_host/src/main/h10_wke_1h/res/layout-land/adapter_visit_bed.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp">
+        <TextView
+            android:id="@+id/tv_visit_bed"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.5"
+            android:text="--"
+            android:textColor="#2F9DF1"
+            android:textSize="20sp"/>
+        <TextView
+            android:id="@+id/tv_visit_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.5"
+            android:text="--"
+            android:textColor="#2F9DF1"
+            android:textSize="20sp"/>
+
+        <Button
+            android:id="@+id/btn_visit"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/str_invite"
+            android:textColor="#2F9DF1"
+            android:textSize="20sp"/>
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/black"/>
+</LinearLayout>

+ 323 - 0
android_host/src/main/h10_wke_1h/res/layout-land/add_the_timing.xml

@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/dds"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/fixed_time_airplay_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="定时播放"
+            android:textSize="5dp" />
+
+
+        <LinearLayout
+            android:id="@+id/period_linlyout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/monday_chebox"
+                android:layout_width="18dp"
+                android:layout_height="13dp"
+                android:text="周一"
+                android:button="@null"
+                android:gravity="center"
+                android:layout_marginLeft="2dp"
+                android:textColor="@drawable/selt_check_box_text_color"
+                android:background="@drawable/selt_check_box_bg"
+                android:textSize="5dp" />
+
+            <CheckBox
+                android:id="@+id/tuesday_chebox"
+                android:layout_width="18dp"
+                android:layout_height="13dp"
+                android:button="@null"
+                android:gravity="center"
+                android:layout_marginLeft="2dp"
+                android:textColor="@drawable/selt_check_box_text_color"
+                android:background="@drawable/selt_check_box_bg"
+                android:text="周二"
+                android:textSize="5dp" />
+
+            <CheckBox
+                android:id="@+id/wednesday_chebox"
+                android:layout_width="18dp"
+                android:layout_height="13dp"
+                android:button="@null"
+                android:gravity="center"
+                android:layout_marginLeft="2dp"
+                android:textColor="@drawable/selt_check_box_text_color"
+                android:background="@drawable/selt_check_box_bg"
+                android:text="周三"
+                android:textSize="5dp" />
+
+            <CheckBox
+                android:id="@+id/thursday_chebox"
+                android:layout_width="18dp"
+                android:layout_height="13dp"
+                android:button="@null"
+                android:gravity="center"
+                android:layout_marginLeft="2dp"
+                android:textColor="@drawable/selt_check_box_text_color"
+                android:background="@drawable/selt_check_box_bg"
+                android:text="周四"
+                android:textSize="5dp" />
+
+            <CheckBox
+                android:id="@+id/friday_chebox"
+                android:layout_width="18dp"
+                android:layout_height="13dp"
+                android:button="@null"
+                android:gravity="center"
+                android:layout_marginLeft="2dp"
+                android:textColor="@drawable/selt_check_box_text_color"
+                android:background="@drawable/selt_check_box_bg"
+                android:text="周五"
+                android:textSize="5dp" />
+
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal">
+
+
+                <CheckBox
+                    android:id="@+id/saturday_chebox"
+                    android:layout_width="18dp"
+                    android:layout_height="13dp"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:layout_marginLeft="2dp"
+                    android:textColor="@drawable/selt_check_box_text_color"
+                    android:background="@drawable/selt_check_box_bg"
+                    android:text="周六"
+                    android:textSize="5dp" />
+
+                <CheckBox
+                    android:id="@+id/week_chebox"
+                    android:layout_width="18dp"
+                    android:layout_height="13dp"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:layout_marginLeft="2dp"
+                    android:textColor="@drawable/selt_check_box_text_color"
+                    android:background="@drawable/selt_check_box_bg"
+                    android:text="周日"
+                    android:textSize="5dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/hour_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="19"
+                        android:textSize="5dp" />
+
+                    <ImageView
+                        android:id="@+id/hour_select_imagev"
+                        android:layout_width="5dp"
+                        android:layout_height="5dp"
+                        android:background="@mipmap/ic_launcher" />
+
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="5dp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/minute_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="19"
+                        android:textSize="5dp" />
+
+                    <ImageView
+                        android:id="@+id/minute_select_imagev"
+                        android:layout_width="5dp"
+                        android:layout_height="5dp"
+                        android:background="@mipmap/ic_launcher" />
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/ward_to_play_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="病区播放"
+            android:textSize="5dp" />
+
+<!--        <ScrollView-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:orientation="horizontal">-->
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <CheckBox
+                    android:id="@+id/area_chebox"
+                    android:layout_width="18dp"
+                    android:layout_height="13dp"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:layout_marginLeft="2dp"
+                    android:textColor="@drawable/selt_check_box_text_color"
+                    android:background="@drawable/selt_check_box_bg"
+                    android:text="病区一"
+                    android:textSize="4dp" />
+
+                <CheckBox
+                    android:id="@+id/the_second_area_chebox"
+                    android:layout_width="18dp"
+                    android:layout_height="13dp"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:layout_marginLeft="2dp"
+                    android:textColor="@drawable/selt_check_box_text_color"
+                    android:background="@drawable/selt_check_box_bg"
+                    android:text="病区二"
+                    android:textSize="4dp" />
+
+                <CheckBox
+                    android:id="@+id/three_areas_chebox"
+                    android:layout_width="18dp"
+                    android:layout_height="13dp"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:layout_marginLeft="2dp"
+                    android:textColor="@drawable/selt_check_box_text_color"
+                    android:background="@drawable/selt_check_box_bg"
+                    android:text="病区三"
+                    android:textSize="4dp" />
+
+                <CheckBox
+                    android:id="@+id/the_four_areas_chebox"
+                    android:layout_width="18dp"
+                    android:layout_height="13dp"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:layout_marginLeft="2dp"
+                    android:textColor="@drawable/selt_check_box_text_color"
+                    android:background="@drawable/selt_check_box_bg"
+                    android:text="病区四"
+                    android:textSize="4dp" />
+
+                <CheckBox
+                    android:id="@+id/five_area_chebox"
+                    android:layout_width="18dp"
+                    android:layout_height="13dp"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:layout_marginLeft="2dp"
+                    android:textColor="@drawable/selt_check_box_text_color"
+                    android:background="@drawable/selt_check_box_bg"
+                    android:text="病区五"
+                    android:textSize="4dp" />
+
+                <CheckBox
+                    android:id="@+id/six_area_chebox"
+                    android:layout_width="18dp"
+                    android:layout_height="13dp"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:layout_marginLeft="2dp"
+                    android:textColor="@drawable/selt_check_box_text_color"
+                    android:background="@drawable/selt_check_box_bg"
+                    android:text="病区六"
+                    android:textSize="4dp" />
+
+            </LinearLayout>
+<!--        </ScrollView>-->
+       <RelativeLayout
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content">
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/play_immediately_bt"
+                    android:layout_width="30dp"
+                    android:layout_height="15dp"
+                    android:text="立即播放"
+                    android:textSize="5dp" />
+
+                <Button
+                    android:id="@+id/delete_bt"
+                    android:layout_width="20dp"
+                    android:layout_height="15dp"
+                    android:text="删除"
+                    android:textSize="5dp" />
+
+                <Button
+                    android:id="@+id/audition_bt"
+                    android:layout_width="20dp"
+                    android:layout_height="15dp"
+                    android:text="试听"
+                    android:textSize="5dp" />
+
+                <Button
+                    android:id="@+id/suspend_bt"
+                    android:layout_width="20dp"
+                    android:layout_height="15dp"
+                    android:text="暂停"
+                    android:textSize="5dp" />
+
+                <Button
+                    android:id="@+id/save_bt"
+                    android:layout_width="20dp"
+                    android:layout_height="15dp"
+                    android:text="保存"
+                    android:textSize="5dp" />
+
+            </LinearLayout>
+        </ScrollView>
+       </RelativeLayout>
+    </LinearLayout>
+</layout>

+ 68 - 0
android_host/src/main/h10_wke_1h/res/layout-land/call_dialog_lay.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!--拨出按钮显示-->
+    <LinearLayout
+        android:id="@+id/ll_call_outgoing"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_out_call_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/call_in_calling"
+            android:textSize="28sp"/>
+
+        <ImageView
+            android:id="@+id/iv_hangup_call"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="60dp"
+            android:src="@drawable/selector_call_hangup" />
+    </LinearLayout>
+
+
+    <!--接听按钮显示-->
+    <RelativeLayout
+        android:id="@+id/rl_call_incoming"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/tv_incoming_call_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/call_incoming"
+            android:textSize="28sp"/>
+
+        <ImageView
+            android:id="@+id/iv_accept_call"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tv_incoming_call_text"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="160dp"
+            android:layout_marginTop="60dp"
+            android:src="@drawable/selector_call_answer"/>
+
+        <ImageView
+            android:id="@+id/iv_reject_call"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tv_incoming_call_text"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="160dp"
+            android:layout_marginTop="60dp"
+            android:src="@drawable/selector_call_end"/>
+    </RelativeLayout>
+
+</RelativeLayout>

+ 17 - 0
android_host/src/main/h10_wke_1h/res/layout-land/digital_item.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/tv_number"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_gray"
+        android:layout_margin="4dp"
+        android:padding="10dp"
+        android:gravity="center"
+        android:textSize="32sp"
+        android:textColor="@color/main_color"/>
+
+</LinearLayout>

+ 23 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_beds_in_the_ward.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        bind:srlEnableRefresh="true"
+        bind:srlEnableLoadMore="false">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/listView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#EE82EE">
+
+        </android.support.v7.widget.RecyclerView>
+
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+</RelativeLayout>
+</layout>

+ 65 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_broadcast.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#EAF2F9">
+
+        <TextView
+            android:id="@+id/tv_broadcast_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="40dp"
+            android:layout_centerHorizontal="true"
+            android:text="@string/str_broadcast"
+            android:textSize="40sp"
+            android:textColor="@color/color_red"
+            android:textStyle="bold" />
+
+        <com.wdkl.ncs.android.lib.widget.VoiceLoadingView
+            android:id="@+id/my_voice_load_view"
+            android:layout_width="260dp"
+            android:layout_height="80dp"
+            android:layout_marginTop="10dp"
+            android:layout_below="@id/tv_broadcast_title"
+            android:layout_centerHorizontal="true"
+            app:cmlv_line_width="4dp"
+            app:cmlv_rail_color="@color/main_color"
+            app:cmlv_rail_count="10"/>
+
+        <ImageView
+            android:id="@+id/btn_record"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:scaleType="center"
+            android:src="@drawable/mic_on" />
+
+        <TextView
+            android:id="@+id/tv_record"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/btn_record"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:text="@string/broadcast_record_start"
+            android:textSize="28sp" />
+
+        <TextView
+            android:id="@+id/btn_broadcast"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="40dp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:background="@drawable/bg_bottom_btn"
+            android:text="@string/broadcast_start"
+            android:textSize="24sp"
+            android:textColor="@drawable/selector_button_text_color"/>
+    </RelativeLayout>
+</layout>

+ 192 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_call_records.xml

@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#87CEFA">
+
+        <LinearLayout
+            android:id="@+id/button_linlyout"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:orientation="horizontal"
+            android:background="#ffffff">
+
+            <RelativeLayout
+                android:id="@+id/calling_linlyout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+                <TextView
+                    android:id="@+id/calling_title_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"
+                    android:singleLine="true"
+                    android:text="@string/str_call"
+                    android:textSize="22sp" />
+
+                <ImageView
+                    android:id="@+id/calling_imagev"
+                    android:layout_width="12dp"
+                    android:layout_height="4dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_below="@id/calling_title_tv"
+                    android:layout_centerHorizontal="true"
+                    android:src="@color/main_color"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/calling_num_tv"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_toRightOf="@id/calling_title_tv"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginTop="12dp"
+                    android:gravity="center"
+                    android:background="@drawable/shape_untreated_quantity"
+                    android:text="9+"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    android:visibility="gone"/>
+
+            </RelativeLayout>
+
+
+            <RelativeLayout
+                android:id="@+id/no_answer_calls_linlyout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+                <TextView
+                    android:id="@+id/no_answer_calls_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"
+                    android:singleLine="true"
+                    android:text="@string/str_missed_call"
+                    android:textSize="22sp" />
+                <ImageView
+                    android:id="@+id/no_answer_calls_imagev"
+                    android:layout_width="12dp"
+                    android:layout_height="4dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_below="@id/no_answer_calls_tv"
+                    android:layout_centerHorizontal="true"
+                    android:src="@color/main_color"/>
+
+            </RelativeLayout>
+
+
+            <RelativeLayout
+                android:id="@+id/call_records_linlyout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+                <TextView
+                    android:id="@+id/call_records_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"
+                    android:singleLine="true"
+                    android:text="@string/str_all_call"
+                    android:textSize="22sp" />
+                <ImageView
+                    android:id="@+id/call_records_imagev"
+                    android:layout_width="12dp"
+                    android:layout_height="4dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_below="@id/call_records_tv"
+                    android:layout_centerHorizontal="true"
+                    android:visibility="gone"
+                    android:src="@color/main_color"/>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/other_linlyout"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/other_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/str_other_call"
+                    android:textSize="22sp" />
+
+                <ImageView
+                    android:id="@+id/other_imagev"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="14dp"
+                    android:src="@drawable/xia_la" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_call_record_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/button_linlyout"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp">
+
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/refresh"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                bind:srlEnableLoadMore="true"
+                bind:srlEnableRefresh="true">
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/listView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="#87CEFA"
+                    android:fadeScrollbars="true"
+                    android:scrollbarSize="4dp"
+                    android:scrollbarThumbVertical="@color/colorPrimaryDark"
+                    android:scrollbars="vertical"/>
+
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+        </LinearLayout>
+
+        <!--呼叫列表-->
+        <LinearLayout
+            android:id="@+id/ll_call_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/button_linlyout"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:visibility="gone">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_calling_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="vertical"
+                android:fadeScrollbars="true"
+                android:scrollbarSize="4dp"
+                android:scrollbarThumbVertical="@color/colorPrimaryDark">
+            </android.support.v7.widget.RecyclerView>
+        </LinearLayout>
+    </RelativeLayout>
+</layout>

+ 229 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_device_manage.xml

@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#EAF2F9"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="220dp">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginTop="20dp"
+                android:layout_weight="1.5"
+                android:padding="10dp">
+
+                <RadioGroup
+                    android:id="@+id/group_devices"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <RadioButton
+                        android:id="@+id/rb_host_device"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/selector_button_bg_color"
+                        android:button="@null"
+                        android:gravity="center"
+                        android:paddingTop="20dp"
+                        android:paddingBottom="20dp"
+                        android:text="本机账号"
+                        android:textSize="24sp" />
+
+                    <RadioButton
+                        android:id="@+id/rb_extension_device"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:background="@drawable/selector_button_bg_color"
+                        android:button="@null"
+                        android:gravity="center"
+                        android:paddingTop="20dp"
+                        android:paddingBottom="20dp"
+                        android:text="对方账号"
+                        android:textSize="24sp" />
+                </RadioGroup>
+            </LinearLayout>
+
+            <FrameLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="5">
+
+                <LinearLayout
+                    android:id="@+id/ll_host_device"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    android:padding="20dp"
+                    android:visibility="visible">
+
+                    <TextView
+                        android:id="@+id/tv_host_sip"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="本机SIP:"
+                        android:textSize="32sp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="40dp"
+                        android:gravity="center_horizontal">
+
+                        <Button
+                            android:id="@+id/btn_host_ip_config"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/selector_button_bg_color2"
+                            android:padding="10dp"
+                            android:text="修改账号"
+                            android:textSize="32sp" />
+
+                        <!--<Button
+                            android:id="@+id/btn_host_ip_delete"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="20dp"
+                            android:background="@drawable/selector_button_bg_color2"
+                            android:padding="10dp"
+                            android:text="删除账号"
+                            android:textSize="32sp" />-->
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_extension_devices"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    android:padding="20dp"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/tv_target_device_sip"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="对方SIP:"
+                        android:textSize="32sp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="40dp"
+                        android:gravity="center_horizontal">
+
+                        <Button
+                            android:id="@+id/btn_config_device"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/selector_button_bg_color2"
+                            android:padding="10dp"
+                            android:text="修改账号"
+                            android:textSize="32sp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+            </FrameLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_system_settings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:gravity="center"
+                android:background="@color/white"
+                android:text="@string/system_settings"
+                android:textColor="#000000"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/tv_restart"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:gravity="center"
+                android:background="@color/white"
+                android:text="@string/register_reboot"
+                android:textColor="#000000"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/tv_sip_test"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:gravity="center"
+                android:background="@color/white"
+                android:text="SIP test"
+                android:textColor="#000000"
+                android:textSize="20sp"
+                android:visibility="gone"/>
+
+            <TextView
+                android:id="@+id/tv_app_version_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:gravity="center"
+                android:background="@color/white"
+                android:text="v1.0"
+                android:textColor="#000000"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/tv_device_sip_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:padding="8dp"
+                android:gravity="center"
+                android:text="sip:"
+                android:textColor="#000000"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/tv_device_ip_address"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:padding="8dp"
+                android:gravity="center"
+                android:textColor="#000000"
+                android:textSize="20sp"
+                android:text="IP:"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</layout>

+ 67 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_doctor_host.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/doctor_host_refresh"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.74"
+            bind:srlEnableLoadMore="false"
+            bind:srlEnableRefresh="true">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/doctor_host_recyv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#EAF2F9"
+                android:padding="10dp" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.26"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="6dp"
+            android:layout_marginRight="6dp">
+
+            <TextView
+                android:id="@+id/call_doctor_host"
+                android:layout_width="match_parent"
+                android:layout_height="72dp"
+                android:layout_alignParentBottom="true"
+                android:padding="16dp"
+                android:gravity="center"
+                android:paddingLeft="40dp"
+                android:drawableLeft="@drawable/ic_call_out"
+                android:background="#2584CC"
+                android:textSize="28sp"
+                android:text="@string/str_call"
+                android:textColor="@drawable/selector_action_button_text_color"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_above="@id/call_doctor_host"
+                android:orientation="vertical"
+                android:background="@color/color_white">
+
+                <TextView
+                    android:id="@+id/tv_doctor_name_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="4dp"
+                    android:gravity="center"
+                    android:text="--"
+                    android:textSize="24sp"
+                    android:textColor="#2F9DF1"/>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+</layout>

+ 134 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_entraceguard_video.xml

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/background_dark">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="3"
+            android:orientation="vertical"
+            android:layout_gravity="center"
+            android:background="#eee"
+            android:layout_height="match_parent">
+
+            <FrameLayout
+                android:id="@+id/remote_video_surface"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                android:layout_gravity="center" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/color_white"
+            android:orientation="vertical"
+            android:textAlignment="center">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="50dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="20dp"
+                android:text="@string/entrance_call"
+                android:textAlignment="center"
+                android:textColor="@color/colorPrimary"
+                android:textSize="22sp"/>
+
+            <LinearLayout
+                android:id="@+id/unlock_door"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@drawable/button_bg_blue"
+                android:gravity="center"
+                android:padding="10dp">
+
+                <ImageView
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:src="@drawable/lock_on"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="30dp"
+                    android:layout_marginRight="30dp"
+                    android:text="@string/door_open"
+                    android:textColor="#fff"
+                    android:textFontWeight="400"
+                    android:textSize="30sp"/>
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="20dp"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="20dp"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:id="@+id/speaker_on"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="0dp"
+                        android:src="@drawable/entrace_mute_selector" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:text="@string/call_volume_control"
+                        android:textColor="@color/colorPrimary"
+                        android:textSize="20sp" />
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="20dp"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:id="@+id/sky_voice_call_hangup"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:src="@drawable/selector_call_hangup" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:text="@string/call_end"
+                        android:textColor="@color/color_red"
+                        android:textSize="20sp" />
+                </LinearLayout>
+            </LinearLayout>
+
+
+        </LinearLayout>
+    </LinearLayout>
+</layout>

+ 42 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_frame_part.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#EAF2F9">
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/refresh"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="0.74"
+            bind:srlEnableLoadMore="false"
+            bind:srlEnableRefresh="true">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/listView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="vertical"
+                android:fadeScrollbars="true"
+                android:scrollbarStyle="insideOverlay" />
+
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="6dp"
+            android:layout_weight="0.26">
+
+            <include
+                android:id="@+id/right_incident_relyout"
+                layout="@layout/right_basic_information" />
+        </RelativeLayout>
+
+    </LinearLayout>
+</layout>

+ 250 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_home.xml

@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#EAF2F9">
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/bed_refresh"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="0.74"
+            bind:srlEnableLoadMore="false"
+            bind:srlEnableRefresh="true">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/bed_list_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="10dp"
+                android:fadeScrollbars="true"
+                android:scrollbarStyle="insideOverlay"
+                android:scrollbars="vertical" />
+
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="6dp"
+            android:layout_weight="0.26"
+            android:background="#EAF2F9">
+
+            <LinearLayout
+                android:id="@+id/voice_call_layout"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="16dp"
+                android:background="#F3F9FE"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/call_the_voice_tv"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableLeft="@drawable/ic_call_out"
+                    android:ellipsize="end"
+                    android:gravity="center"
+                    android:paddingLeft="10dp"
+                    android:singleLine="true"
+                    android:text="@string/voice_call"
+                    android:textColor="@drawable/selector_action_button_text_color"
+                    android:textSize="28sp" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/white" />
+
+                <TextView
+                    android:id="@+id/call_the_video_tv"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableLeft="@drawable/ic_video_call"
+                    android:ellipsize="end"
+                    android:gravity="center"
+                    android:paddingLeft="10dp"
+                    android:singleLine="true"
+                    android:text="@string/video_call"
+                    android:textColor="@drawable/selector_action_button_text_color"
+                    android:textSize="28sp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_basic_title"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginTop="10dp"
+                android:background="#ffffff"
+                android:gravity="center"
+                android:textColor="@color/main_color"
+                android:text="@string/basic_info"
+                android:textSize="24sp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@id/tv_basic_title"
+                android:layout_above="@id/voice_call_layout"
+                android:layout_marginTop="6dp"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:id="@+id/rl_basic_info"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="6dp"
+                    android:background="#ffffff">
+
+                    <ImageView
+                        android:id="@+id/bed_imagev"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="10dp"
+                        android:src="@drawable/kong_chuang" />
+
+                    <TextView
+                        android:id="@+id/bed_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="6dp"
+                        android:layout_toRightOf="@+id/bed_imagev"
+                        android:text="--"
+                        android:textColor="#2F9DF1"
+                        android:textSize="22sp" />
+
+                    <TextView
+                        android:id="@+id/bed_sip_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/bed_imagev"
+                        android:layout_marginTop="6dp"
+                        android:padding="10dp"
+                        android:textColor="#0D0D0D"
+                        android:textSize="20sp" />
+
+                    <LinearLayout
+                        android:id="@+id/custom_information_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/bed_name"
+                        android:layout_alignLeft="@+id/bed_name"
+                        android:layout_marginTop="6dp"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:id="@+id/name_tv"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="5"
+                            android:singleLine="true"
+                            android:text="---"
+                            android:textColor="#0D0D0D"
+                            android:textSize="20sp" />
+
+                        <ImageView
+                            android:id="@+id/gender_imagev"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_weight="1" />
+
+                        <TextView
+                            android:id="@+id/age_tv"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="2"
+                            android:gravity="center"
+                            android:text="--"
+                            android:textColor="#B4B4B4"
+                            android:textSize="18sp" />
+
+                    </LinearLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/time_relalyout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/custom_information_layout"
+                        android:layout_marginTop="20dp"
+                        android:layout_marginRight="10dp"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/indate"
+                            android:textColor="#0D0D0D"
+                            android:textSize="18sp" />
+
+                        <TextView
+                            android:id="@+id/time_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginLeft="8dp"
+                            android:text="----"
+                            android:textColor="#B4B4B4"
+                            android:textSize="16sp" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/phone_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/time_relalyout"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginRight="10dp"
+                        android:gravity="center_vertical"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/mobile"
+                            android:textColor="#0D0D0D"
+                            android:textSize="18sp" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginRight="2dp"
+                            android:layout_toLeftOf="@+id/mobile_tv"
+                            android:src="@drawable/dian_hua" />
+
+                        <TextView
+                            android:id="@+id/mobile_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/empty"
+                            android:textColor="#B4B4B4"
+                            android:textSize="16sp" />
+
+                    </RelativeLayout>
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+</layout>

+ 71 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_home_call.xml

@@ -0,0 +1,71 @@
+<?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:gravity="center"
+        android:background="@drawable/main_bg_1280x800">
+
+        <Button
+            android:id="@+id/sip_call_voice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="160dp"
+            android:padding="20dp"
+            android:background="@drawable/round_button"
+            android:text="语音"
+            android:textColor="@drawable/selector_button_text_color"
+            android:textSize="36sp"/>
+
+        <Button
+            android:id="@+id/sip_call_video"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="160dp"
+            android:layout_marginStart="60dp"
+            android:padding="20dp"
+            android:background="@drawable/round_button"
+            android:text="视频"
+            android:textColor="@drawable/selector_button_text_color"
+            android:textSize="36sp"/>
+
+        <!--<TextView
+            android:id="@+id/sip_call_voice_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="100dp"
+            android:background="#B4B4B4"
+            android:drawableLeft="@drawable/ic_voice_callout"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:drawablePadding="20dp"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:singleLine="true"
+            android:text="@string/voice_call"
+            android:textColor="@drawable/selector_action_button_text_color"
+            android:textSize="32sp" />
+
+        <TextView
+            android:id="@+id/sip_call_video_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="100dp"
+            android:layout_marginTop="40dp"
+            android:background="#B4B4B4"
+            android:drawableLeft="@drawable/ic_video_callout"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:drawablePadding="20dp"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:singleLine="true"
+            android:text="@string/video_call"
+            android:textColor="@drawable/selector_action_button_text_color"
+            android:textSize="32sp" />-->
+    </LinearLayout>
+
+</layout>

+ 26 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_inpatient_ward.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/title_tv"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:gravity="center"
+        android:textSize="8dp"
+        android:text="病区"/>
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_below="@+id/title_tv"
+    android:orientation="vertical">
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/inpatient_ward_recview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </android.support.v7.widget.RecyclerView>
+</LinearLayout>
+
+</RelativeLayout>
+</layout>

+ 278 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_led_settings.xml

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#EAF2F9">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="8dp">
+
+        <TextView
+            android:id="@+id/tv_led_empty_titile"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/led_null"
+            android:textColor="@color/red_color"
+            android:textSize="32sp"
+            android:visibility="gone"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="240dp">
+            <!--左侧点阵屏列表-->
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/led_refresh"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="3"
+                bind:srlEnableLoadMore="false"
+                bind:srlEnableRefresh="true">
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/recycler_led_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="10dp"
+                android:background="@color/main_color" />
+
+            <!--右侧点阵屏具体设置-->
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="10dp"
+                android:layout_weight="7"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/tv_led_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text=""
+                    android:textSize="24sp" />
+
+                <TextView
+                    android:id="@+id/tv_led_voice_on"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text=""
+                    android:textSize="24sp" />
+
+                <TextView
+                    android:id="@+id/tv_led_font_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text=""
+                    android:textSize="24sp" />
+
+                <Button
+                    android:id="@+id/btn_ping"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="PING"
+                    android:textSize="20sp"
+                    android:visibility="gone"/>
+            </LinearLayout>
+        </LinearLayout>
+
+        <!--点阵屏全局设置-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_marginTop="20dp"
+            android:padding="10dp">
+
+            <Button
+                android:id="@+id/btn_sync_time"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_margin="4dp"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="@string/led_sync_time"
+                android:textSize="18sp" />
+
+            <Button
+                android:id="@+id/btn_reset_led"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_margin="4dp"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="@string/led_reset"
+                android:textSize="18sp" />
+
+            <Button
+                android:id="@+id/btn_power_on_off"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_margin="4dp"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="@string/led_on_off"
+                android:textSize="18sp" />
+
+            <Button
+                android:id="@+id/btn_check_font"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_margin="4dp"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="@string/led_check_font"
+                android:textSize="18sp" />
+
+            <Button
+                android:id="@+id/btn_update_font"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_margin="4dp"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="@string/led_copy_font"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:padding="14dp"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/tv_led_program_time"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textSize="22sp" />
+
+            <SeekBar
+                android:id="@+id/skb_led_program_time"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="8dp"
+                android:max="30"
+                android:maxHeight="2dp"
+                android:progressDrawable="@drawable/po_seekbar"
+                android:thumb="@drawable/seekbar_thumb"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:padding="14dp"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/tv_led_volume"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textSize="22sp" />
+
+            <SeekBar
+                android:id="@+id/skb_led_volume"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="8dp"
+                android:max="10"
+                android:maxHeight="2dp"
+                android:progressDrawable="@drawable/po_seekbar"
+                android:thumb="@drawable/seekbar_thumb"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:padding="14dp"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/tv_led_voice_times"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textSize="22sp" />
+
+            <SeekBar
+                android:id="@+id/skb_led_voice_times"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="8dp"
+                android:max="5"
+                android:maxHeight="2dp"
+                android:progressDrawable="@drawable/po_seekbar"
+                android:thumb="@drawable/seekbar_thumb"/>
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:padding="14dp">
+
+            <TextView
+                android:id="@+id/led_info_type_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/led_default_info"
+                android:textSize="22sp" />
+
+            <RadioGroup
+                android:id="@+id/group_led_info_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:layout_toRightOf="@id/led_info_type_title"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/rb_date_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/led_show_date"
+                    android:textSize="22sp" />
+
+                <RadioButton
+                    android:id="@+id/rb_custom_info"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:text="@string/led_add_info"
+                    android:textSize="22sp" />
+            </RadioGroup>
+
+            <EditText
+                android:id="@+id/led_custom_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/led_info_type_title"
+                android:layout_marginTop="10dp"
+                android:textSize="22sp"
+                android:visibility="invisible" />
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
+</layout>

+ 75 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_nurse_move.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:background="#EAF2F9">
+
+
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/nurse_mobile_refresh"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="0.74"
+        bind:srlEnableLoadMore="false"
+        bind:srlEnableRefresh="true">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/nurse_mobile_rv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="10dp"/>
+
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="0.26"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="6dp"
+        android:layout_marginRight="6dp">
+
+        <TextView
+            android:id="@+id/call_nurse_mobile"
+            android:layout_width="match_parent"
+            android:layout_height="72dp"
+            android:layout_alignParentBottom="true"
+            android:padding="16dp"
+            android:gravity="center"
+            android:paddingLeft="40dp"
+            android:drawableLeft="@drawable/ic_call_out"
+            android:background="#2584CC"
+            android:textSize="28sp"
+            android:text="@string/str_call"
+            android:textColor="@drawable/selector_action_button_text_color"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/call_nurse_mobile"
+            android:orientation="vertical"
+            android:background="@color/color_white">
+
+            <TextView
+                android:id="@+id/tv_manager_bed_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
+                android:gravity="center"
+                android:text="@string/responsible_bed"
+                android:textSize="24sp"
+                android:textColor="#2F9DF1"/>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/nurse_duty_sickbed_rev"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="10dp"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+</LinearLayout>
+</layout>

+ 109 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_other_host.xml

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.22"
+            android:padding="10dp"
+            android:background="#EAF2F9">
+
+            <RadioGroup
+                android:id="@+id/group_host"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <RadioButton
+                    android:id="@+id/rb_other_host"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="20dp"
+                    android:paddingBottom="20dp"
+                    android:background="@drawable/selector_button_bg_color"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/str_other_host"
+                    android:textSize="24sp"/>
+
+                <RadioButton
+                    android:id="@+id/rb_manager_host"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:paddingTop="20dp"
+                    android:paddingBottom="20dp"
+                    android:background="@drawable/selector_button_bg_color"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/str_manager_host"
+                    android:textSize="24sp"/>
+            </RadioGroup>
+        </LinearLayout>
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/other_host_refresh"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.52"
+            bind:srlEnableLoadMore="false"
+            bind:srlEnableRefresh="false">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_other_host"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#EAF2F9"
+                android:padding="10dp"/>
+
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="6dp"
+            android:layout_marginBottom="6dp"
+            android:layout_weight="0.26">
+
+            <TextView
+                android:id="@+id/call_other_host"
+                android:layout_width="match_parent"
+                android:layout_height="72dp"
+                android:layout_alignParentBottom="true"
+                android:background="#2584CC"
+                android:drawableLeft="@drawable/ic_call_out"
+                android:gravity="center"
+                android:padding="16dp"
+                android:paddingLeft="40dp"
+                android:text="@string/str_call"
+                android:textColor="@drawable/selector_action_button_text_color"
+                android:textSize="28sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_above="@id/call_other_host"
+                android:background="@color/color_white"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/tv_device_name_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:padding="4dp"
+                    android:text="--"
+                    android:textColor="#2F9DF1"
+                    android:textSize="24sp" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</layout>

+ 28 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_sickbed.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+<TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textSize="20dp"
+    android:text="这是病床界面"/>
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/sickbed_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        bind:srlEnableRefresh="true"
+        bind:srlEnableLoadMore="false">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/sickbed_recyv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#EE1289">
+
+        </android.support.v7.widget.RecyclerView>
+
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+</RelativeLayout>
+</layout>

File diff suppressed because it is too large
+ 1656 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_system_settings.xml


+ 12 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_trust_management.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20dp"
+        android:text="这是托管界面"/>
+</LinearLayout>
+</layout>

+ 166 - 0
android_host/src/main/h10_wke_1h/res/layout-land/fragment_visit_management.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto">
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="这是探视主机"
+            android:textSize="20dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.6"
+                android:orientation="vertical">
+
+                <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                    android:id="@+id/visit_the_host_refresh"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="0.5"
+                    bind:srlEnableLoadMore="false"
+                    bind:srlEnableRefresh="true">
+
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/visit_the_host_recyv"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="#98FB98">
+
+                    </android.support.v7.widget.RecyclerView>
+
+                </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+                <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                    android:id="@+id/visual_extension_refresh"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="0.5"
+                    bind:srlEnableLoadMore="false"
+                    bind:srlEnableRefresh="true">
+
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/visual_extension_recyv"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="#98FB98">
+
+                    </android.support.v7.widget.RecyclerView>
+
+                </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+            </LinearLayout>
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.4">
+
+                <ImageView
+                    android:id="@+id/doctor_photo_imagev"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:background="@mipmap/ic_launcher" />
+
+                <LinearLayout
+                    android:id="@+id/doctor_message_linlyout"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_toRightOf="@+id/doctor_photo_imagev"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:id="@+id/data_linlayout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/doctor_name_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="2dp"
+                            android:text="王医生"
+                            android:textSize="5dp" />
+
+                        <TextView
+                            android:id="@+id/doctor_sex_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginRight="2dp"
+                            android:text="性别"
+                            android:textSize="5dp" />
+
+                        <TextView
+                            android:id="@+id/doctor_age_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="2dp"
+                            android:text="年龄"
+                            android:textSize="5dp" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="5dp">
+
+                        <TextView
+                            android:id="@+id/doctor_phone"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="12345678978"
+                            android:textSize="8dp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/responsibility_bed_linlyout"
+                    android:layout_width="match_parent"
+                    android:layout_height="360dp"
+                    android:layout_below="@+id/doctor_message_linlyout"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="责任床位"
+                        android:textSize="8dp" />
+
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/doctor_duty_sickbed_rev"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="#800000"></android.support.v7.widget.RecyclerView>
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/call_doctor_bt"
+                    android:layout_width="match_parent"
+                    android:layout_height="20dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:text="呼叫"
+                    android:textSize="8dp" />
+
+
+            </RelativeLayout>
+        </LinearLayout>
+
+    </RelativeLayout>
+</layout>

+ 39 - 0
android_host/src/main/h10_wke_1h/res/layout-land/item_cost_detail.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="10dp">
+
+    <TextView
+        android:id="@+id/tv_item_cost_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:textColor="@color/black"/>
+    <TextView
+        android:id="@+id/tv_item_cost_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:textSize="16sp"
+        android:textColor="@color/black"/>
+    <TextView
+        android:id="@+id/tv_item_cost_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tv_item_cost_name"
+        android:layout_marginTop="4dp"
+        android:textSize="16sp"
+        android:textColor="#A4A4A4"/>
+    <TextView
+        android:id="@+id/tv_item_cost_unit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@id/tv_item_cost_value"
+        android:layout_marginTop="4dp"
+        android:textSize="16sp"
+        android:textColor="#A4A4A4"/>
+
+</RelativeLayout>

+ 38 - 0
android_host/src/main/h10_wke_1h/res/layout-land/item_cost_main_view.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="6dp"
+    android:layout_marginBottom="6dp"
+    android:orientation="vertical"
+    android:background="@color/white">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/tv_cost_group_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text=""
+            android:textColor="@color/main_color"
+            android:textSize="18sp"/>
+        <TextView
+            android:id="@+id/tv_cost_group_total"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="right"
+            android:text=""
+            android:textColor="@color/main_color"
+            android:textSize="18sp"/>
+    </LinearLayout>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_cost_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>

+ 38 - 0
android_host/src/main/h10_wke_1h/res/layout-land/item_exam_detail.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="10dp">
+
+    <TextView
+        android:id="@+id/tv_item_exam_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:textColor="@color/black"/>
+    <TextView
+        android:id="@+id/tv_item_exam_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:textSize="16sp"
+        android:textColor="@color/black"/>
+    <TextView
+        android:id="@+id/tv_item_exam_desc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tv_item_exam_name"
+        android:layout_marginTop="4dp"
+        android:textSize="16sp"
+        android:textColor="@color/black"/>
+    <TextView
+        android:id="@+id/tv_item_exam_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tv_item_exam_desc"
+        android:layout_marginTop="4dp"
+        android:textSize="16sp"
+        android:textColor="#A4A4A4"/>
+
+</RelativeLayout>

+ 29 - 0
android_host/src/main/h10_wke_1h/res/layout-land/item_exam_main_view.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="6dp"
+    android:layout_marginBottom="6dp"
+    android:orientation="vertical"
+    android:background="@color/white">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/tv_exam_group_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text=""
+            android:textColor="@color/main_color"
+            android:textSize="18sp"/>
+    </LinearLayout>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_exam_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>

+ 85 - 0
android_host/src/main/h10_wke_1h/res/layout-land/language_set_dialog.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_language_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/language_set_mode"
+        android:textSize="24sp" />
+
+    <RadioGroup
+        android:id="@+id/group_language_mode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:orientation="horizontal">
+        <RadioButton
+            android:id="@+id/rb_language_yes"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="24sp"
+            android:text="@string/str_yes"/>
+        <RadioButton
+            android:id="@+id/rb_language_no"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:textSize="24sp"
+            android:text="@string/str_no"/>
+    </RadioGroup>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/language_set_title"
+            android:textSize="24sp" />
+
+        <Spinner
+            android:id="@+id/spinner_language_select"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="60dp"
+        android:gravity="center_horizontal">
+        <Button
+            android:id="@+id/confirm_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_bottom_btn"
+            android:padding="8dp"
+            android:text="@string/str_confirm"
+            android:textSize="20sp"
+            android:textColor="@drawable/selector_bottom_btn_text_color"/>
+
+        <Button
+            android:id="@+id/cancel_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="40dp"
+            android:background="@drawable/bg_bottom_btn"
+            android:padding="8dp"
+            android:text="@string/str_cancel"
+            android:textSize="20sp"
+            android:textColor="@drawable/selector_bottom_btn_text_color"/>
+    </LinearLayout>
+
+</LinearLayout>

+ 67 - 0
android_host/src/main/h10_wke_1h/res/layout-land/password_dialog_lay.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <!--密码框-->
+    <TextView
+        android:id="@+id/tv_psw_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:hint="@string/input_password"
+        android:textColor="@color/main_color"
+        android:textSize="24sp" />
+
+    <GridView
+        android:id="@+id/grid_psw"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:horizontalSpacing="5dp"
+        android:numColumns="3"
+        android:verticalSpacing="5dp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/btn_delete"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:padding="4dp"
+            android:text="@string/str_delete"
+            android:textColor="@color/main_color"
+            android:textSize="24sp" />
+
+        <TextView
+            android:id="@+id/btn_cancel"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:padding="4dp"
+            android:text="@string/str_cancel"
+            android:textColor="@color/main_color"
+            android:textSize="24sp" />
+
+        <TextView
+            android:id="@+id/btn_confirm"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:padding="4dp"
+            android:text="@string/str_confirm"
+            android:textColor="@color/main_color"
+            android:textSize="24sp" />
+    </LinearLayout>
+
+</LinearLayout>

+ 457 - 0
android_host/src/main/h10_wke_1h/res/layout-land/right_basic_information.xml

@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#EAF2F9">
+
+        <LinearLayout
+            android:id="@+id/call_the_voice_linlyout"
+            android:layout_width="match_parent"
+            android:layout_height="70dp"
+            android:layout_alignParentBottom="true"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:layout_marginBottom="16dp"
+            android:background="#F3F9FE"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/call_the_voice_tv"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:paddingLeft="10dp"
+                android:drawableLeft="@drawable/ic_call_out"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textSize="28sp"
+                android:text="@string/voice_call"
+                android:textColor="@drawable/selector_action_button_text_color"/>
+
+            <View
+                android:layout_width="2dp"
+                android:layout_height="match_parent"
+                android:background="@color/white"/>
+
+            <TextView
+                android:id="@+id/call_the_video_tv"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:paddingLeft="10dp"
+                android:drawableLeft="@drawable/ic_video_call"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textSize="28sp"
+                android:text="@string/video_call"
+                android:textColor="@drawable/selector_action_button_text_color"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_above="@id/call_the_voice_linlyout">
+
+            <RadioGroup
+                android:id="@+id/group_custom_info"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginTop="10dp"
+                android:background="#ffffff"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/basic_radio"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:checked="true"
+                    android:drawableBottom="@drawable/selt_call_records_icon"
+                    android:drawablePadding="1px"
+                    android:gravity="center"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:textColor="@drawable/selt_call_records_text"
+                    android:text="@string/basic_info"
+                    android:textSize="18sp" />
+
+                <RadioButton
+                    android:id="@+id/fee_radio"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:drawableBottom="@drawable/selt_call_records_icon"
+                    android:drawablePadding="1px"
+                    android:gravity="center"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:textColor="@drawable/selt_call_records_text"
+                    android:text="@string/fees_info"
+                    android:textSize="18sp"
+                    android:visibility="gone"/>
+
+                <RadioButton
+                    android:id="@+id/exam_radio"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:drawableBottom="@drawable/selt_call_records_icon"
+                    android:drawablePadding="1px"
+                    android:gravity="center"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:textColor="@drawable/selt_call_records_text"
+                    android:text="@string/inspection_info"
+                    android:textSize="18sp"
+                    android:visibility="gone"/>
+            </RadioGroup>
+
+            <RelativeLayout
+                android:id="@+id/rl_basic_info"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="6dp"
+                android:background="#ffffff">
+
+                <ImageView
+                    android:id="@+id/head_portrait_imagev"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="10dp"
+                    android:src="@drawable/kong_chuang" />
+
+                <TextView
+                    android:id="@+id/roomNumber"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/head_portrait_imagev"
+                    android:text="--"
+                    android:textColor="#2F9DF1"
+                    android:textSize="20sp" />
+
+                <!--<RelativeLayout
+                    android:id="@+id/basic_information_relalyou"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10px"
+                    android:layout_marginRight="10px"
+                    android:layout_marginLeft="10px"
+                    android:layout_toRightOf="@+id/head_portrait_imagev">
+
+                    <TextView
+                        android:id="@+id/name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8px"
+                        android:text="-&#45;&#45;"
+                        android:textSize="16sp"
+                        android:textColor="#0D0D0D"/>
+
+                    <TextView
+                        android:id="@+id/roomNumber"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:text="&#45;&#45;"
+                        android:textColor="#2F9DF1"
+                        android:textSize="14sp" />
+
+                </RelativeLayout>-->
+
+                <LinearLayout
+                    android:id="@+id/custom_information_linlayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/roomNumber"
+                    android:layout_alignLeft="@+id/roomNumber"
+                    android:layout_marginTop="6dp">
+
+                    <TextView
+                        android:id="@+id/name_tv"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:singleLine="true"
+                        android:text="---"
+                        android:textSize="20sp"
+                        android:textColor="#0D0D0D"/>
+
+                    <ImageView
+                        android:id="@+id/gender_imagev"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/age_tv"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:gravity="center"
+                        android:text="--"
+                        android:textColor="#B4B4B4"
+                        android:textSize="18sp" />
+
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:id="@+id/time_relalyout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_below="@+id/custom_information_linlayout"
+                    android:layout_marginTop="20dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/indate"
+                        android:textSize="18sp"
+                        android:textColor="#0D0D0D"/>
+
+                    <TextView
+                        android:id="@+id/time_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginLeft="8dp"
+                        android:text="----"
+                        android:textColor="#B4B4B4"
+                        android:textSize="16sp" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/phone_relalyout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:layout_marginRight="10dp"
+                    android:layout_below="@+id/time_relalyout"
+                    android:layout_marginTop="8dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/mobile"
+                        android:textSize="18sp"
+                        android:textColor="#0D0D0D"/>
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="2dp"
+                        android:layout_centerVertical="true"
+                        android:layout_toLeftOf="@+id/mobile_tv"
+                        android:src="@drawable/dian_hua" />
+
+                    <TextView
+                        android:id="@+id/mobile_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/empty"
+                        android:textColor="#B4B4B4"
+                        android:textSize="16sp" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/doctor_duty_relalyout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_below="@+id/phone_relalyout"
+                    android:layout_marginTop="8dp"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/tv_doctor_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/duty_doctor"
+                        android:textSize="18sp"
+                        android:textColor="#0D0D0D"/>
+
+                    <TextView
+                        android:id="@+id/tv_doctor_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginLeft="8dp"
+                        android:text="----"
+                        android:textColor="#B4B4B4"
+                        android:textSize="16sp" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/nurse_duty_relalyout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_below="@+id/doctor_duty_relalyout"
+                    android:layout_marginTop="8dp"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/tv_nurse_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/duty_nurse"
+                        android:textSize="18sp"
+                        android:textColor="#0D0D0D"/>
+
+                    <TextView
+                        android:id="@+id/tv_nurse_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginLeft="8dp"
+                        android:text="----"
+                        android:textColor="#B4B4B4"
+                        android:textSize="16sp" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/nurse_config_relalyout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_below="@+id/nurse_duty_relalyout"
+                    android:layout_marginTop="8dp"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/tv_nurse_config_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/nursing_configs"
+                        android:textSize="18sp"
+                        android:textColor="#0D0D0D"/>
+
+                    <TextView
+                        android:id="@+id/tv_nurse_config"
+                        android:layout_width="wrap_content"
+                        android:layout_height="100dp"
+                        android:layout_below="@id/tv_nurse_config_title"
+                        android:layout_marginLeft="8dp"
+                        android:text="----"
+                        android:textColor="#B4B4B4"
+                        android:textSize="16sp" />
+
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:id="@+id/advice_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/nurse_config_relalyout"
+                    android:layout_marginTop="4dp"
+                    android:paddingTop="4dp"
+                    android:background="#F3F9FE"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/orders"
+                        android:textSize="18sp"
+                        android:textColor="#0D0D0D"/>
+
+                    <TextView
+                        android:id="@+id/tv_advice_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="64dp"
+                        android:layout_marginLeft="8dp"
+                        android:scrollbars="vertical"
+                        android:fadeScrollbars="true"
+                        android:text="----"
+                        android:textColor="#B4B4B4"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/illness_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/advice_layout"
+                    android:layout_marginTop="8dp"
+                    android:paddingTop="4dp"
+                    android:background="#F3F9FE"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/illness"
+                        android:textSize="18sp"
+                        android:textColor="#0D0D0D"/>
+
+                    <TextView
+                        android:id="@+id/tv_illness_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="64dp"
+                        android:layout_marginLeft="8dp"
+                        android:scrollbars="vertical"
+                        android:fadeScrollbars="true"
+                        android:text="----"
+                        android:textColor="#B4B4B4"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_fee_config"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone">
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/rv_fee_config"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/ll_exam_config"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone">
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/rv_exam_config"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+</layout>

+ 137 - 0
android_host/src/main/h10_wke_1h/res/layout-land/right_list.xml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#436EEE">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/sickroom_and_sickbed_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="15dp"
+                    android:background="#98FB98"
+                    android:gravity="center"
+                    android:text="05房01床"
+                    android:textSize="8dp" />
+
+                <TextView
+                    android:id="@+id/name_tv"
+                    style="@style/patient_infomation"
+                    android:text="姓名:張三" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.3dp"
+                    android:background="#B0B0B0" />
+
+                <TextView
+                    android:id="@+id/sex_tv"
+                    style="@style/patient_infomation"
+                    android:text="性别:男" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.3dp"
+                    android:background="#B0B0B0" />
+
+                <TextView
+                    android:id="@+id/age_tv"
+                    style="@style/patient_infomation"
+                    android:text="年龄:23" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.3dp"
+                    android:background="#B0B0B0" />
+
+                <TextView
+                    android:id="@+id/admission_time_tv"
+                    style="@style/patient_infomation"
+                    android:text="入院时间:2021-03-15 12:23" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.3dp"
+                    android:background="#B0B0B0" />
+
+                <TextView
+                    android:id="@+id/level_of_care_tv"
+                    style="@style/patient_infomation"
+                    android:text="护理等级:特技" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.3dp"
+                    android:background="#B0B0B0" />
+
+                <TextView
+                    android:id="@+id/responsibility_doctor_tv"
+                    style="@style/patient_infomation"
+                    android:text="责任医生:张医生" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.3dp"
+                    android:background="#B0B0B0" />
+
+                <TextView
+                    android:id="@+id/charge_nurse_tv"
+                    style="@style/patient_infomation"
+                    android:text="责任护士:張三" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.3dp"
+                    android:background="#B0B0B0" />
+
+                <TextView
+                    android:id="@+id/transfusion_state_tv"
+                    style="@style/patient_infomation"
+                    android:text="输液状态:10分钟" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.3dp"
+                    android:background="#B0B0B0" />
+
+                <TextView
+                    android:id="@+id/remark_tv"
+                    style="@style/patient_infomation"
+                    android:text="备注:張三" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.3dp"
+                    android:background="#B0B0B0" />
+
+
+                <Button
+                    android:id="@+id/call_voice_bt"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp" />
+            </LinearLayout>
+        </ScrollView>
+
+        <Button
+            android:id="@+id/call_bt"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp" />
+
+    </RelativeLayout>
+</layout>

+ 189 - 0
android_host/src/main/h10_wke_1h/res/layout-land/server_config_dialog_lay.xml

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!--密码框-->
+    <LinearLayout
+        android:id="@+id/ll_password"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_psw_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textSize="24sp"
+            android:hint="@string/input_password"
+            android:textColor="@color/main_color"/>
+
+        <GridView
+            android:id="@+id/grid_psw"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:verticalSpacing="5dp"
+            android:horizontalSpacing="5dp"
+            android:numColumns="3"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/btn_delete"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="4dp"
+                android:gravity="center_horizontal"
+                android:text="@string/str_delete"
+                android:textSize="24sp"
+                android:textColor="@color/main_color"/>
+
+            <TextView
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="4dp"
+                android:gravity="center_horizontal"
+                android:text="@string/str_cancel"
+                android:textSize="24sp"
+                android:textColor="@color/main_color"/>
+            <TextView
+                android:id="@+id/btn_confirm"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="4dp"
+                android:gravity="center_horizontal"
+                android:text="@string/str_confirm"
+                android:textSize="24sp"
+                android:textColor="@color/main_color"/>
+        </LinearLayout>
+    </LinearLayout>
+
+
+    <!--服务器ip配置-->
+    <LinearLayout
+        android:id="@+id/ll_server_config"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="20dp"
+        android:padding="10dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Server IP:"
+                android:textSize="20sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:inputType="textUri"
+                android:textSize="20sp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Port:"
+                android:textSize="20sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_port"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:inputType="number"
+                android:textSize="20sp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Sip IP:"
+                android:textSize="20sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_sip_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:inputType="textUri"
+                android:textSize="20sp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Sip port:"
+                android:textSize="20sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_sip_port"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:inputType="number"
+                android:textSize="20sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp">
+            <TextView
+                android:id="@+id/btn_cancel_config"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="@string/str_cancel"
+                android:textSize="28sp"
+                android:textColor="@color/black"/>
+
+            <TextView
+                android:id="@+id/btn_save_config"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="@string/str_save"
+                android:textSize="28sp"
+                android:textColor="@color/black" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>

+ 217 - 0
android_host/src/main/h10_wke_1h/res/layout-land/sip_call_layout.xml

@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/call_bg">
+
+        <RelativeLayout
+            android:id="@+id/video_call_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone">
+
+            <!--对方画面-->
+            <TextureView
+                android:id="@+id/remote_video_frame"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center" />
+
+            <!--本机画面-->
+            <TextureView
+                android:id="@+id/local_video_frame"
+                android:layout_width="200dp"
+                android:layout_height="240dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_alignParentRight="true" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/video_visit_call_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone">
+            <FrameLayout
+                android:id="@+id/visit_video_frame1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_camera"/>
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/visit_video_frame2"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"/>
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:id="@+id/ll_voice_call"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="240dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/sky_voice_call_calling_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@color/white"
+                    android:textSize="32sp" />
+
+                <TextView
+                    android:id="@+id/sky_call_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@color/white"
+                    android:textSize="32sp" />
+
+            </LinearLayout>
+
+            <!--呼出-->
+            <LinearLayout
+                android:id="@+id/sky_voice_call_outgoing"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="80dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:visibility="visible">
+
+                <Chronometer
+                    android:id="@+id/sky_voice_call_timer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="00:00"
+                    android:textColor="@color/white"
+                    android:textSize="24sp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp">
+
+                    <ImageView
+                        android:id="@+id/sky_voice_call_mute"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_marginRight="40dp"
+                        android:src="@drawable/av_mute_selector"
+                        android:visibility="gone"/>
+
+                    <ImageView
+                        android:id="@+id/sky_voice_call_hangup"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:src="@drawable/selector_call_hangup" />
+
+                    <ImageView
+                        android:id="@+id/sky_voice_call_speaker"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_marginLeft="40dp"
+                        android:src="@drawable/av_speaker_selector"
+                        android:visibility="gone"/>
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!--来电-->
+            <LinearLayout
+                android:id="@+id/sky_voice_call_incoming"
+                android:layout_width="match_parent"
+                android:layout_height="140dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="80dp"
+                android:gravity="bottom"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="2" />
+
+                <ImageView
+                    android:id="@+id/sky_voice_call_ring_reject"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/selector_call_hangup" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:id="@+id/sky_voice_call_ring_pickup_audio"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/selector_call_answer" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="2" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_voice_volume_bar"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="120dp"
+                android:layout_marginTop="100dp"
+                android:layout_marginBottom="100dp"
+                android:clipChildren="true"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:visibility="gone">
+                <TextView
+                    android:id="@+id/tv_volume"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:textSize="24sp"
+                    android:textColor="@color/title_text"/>
+
+                <com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper
+                    android:layout_width="24dp"
+                    android:layout_height="match_parent">
+                    <com.wdkl.ncs.android.lib.widget.VerticalSeekBar
+                        android:id="@+id/call_volume_bar"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:padding="8dp"
+                        android:max="10"
+                        android:progress="6"
+                        android:splitTrack="false"
+                        android:progressDrawable="@drawable/seek_bar_bg"
+                        android:thumb="@drawable/seek_bar_thumb"
+                        app:seekBarRotation="CW270" /> <!-- Rotation: CW90 or CW270 -->
+                </com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper>
+            </LinearLayout>
+        </RelativeLayout>
+    </FrameLayout>
+</layout>

+ 212 - 0
android_host/src/main/h10_wke_1h/res/layout-land/sky_voice_call_layout.xml

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gray_deep">
+
+        <RelativeLayout
+            android:id="@+id/video_call_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone">
+            <!--全屏视频画面-->
+            <FrameLayout
+                android:id="@+id/fullscreen_video_frame"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center" />
+
+            <!--小窗视频画面-->
+            <FrameLayout
+                android:id="@+id/pip_video_frame"
+                android:layout_width="200dp"
+                android:layout_height="240dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_alignParentRight="true" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/video_visit_call_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone">
+            <FrameLayout
+                android:id="@+id/visit_video_frame1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_camera"/>
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/visit_video_frame2"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"/>
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/visit_list_view"
+                android:layout_width="320dp"
+                android:layout_height="match_parent"
+                android:background="@color/color_transparent"
+                android:visibility="gone"/>
+
+            <TextView
+                android:id="@+id/tv_visit_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text="@string/str_visiting"
+                android:textSize="36sp"
+                android:textColor="@color/white"
+                android:visibility="gone"/>
+
+            <LinearLayout
+                android:id="@+id/ll_out_call"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="40dp"
+                android:gravity="center"
+                android:visibility="gone">
+
+                <EditText
+                    android:id="@+id/edit_call_number"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="sip:7550000506003011802201@192.168.3.26"
+                    android:textColor="@color/white"
+                    android:textSize="28sp" />
+
+                <Button
+                    android:id="@+id/button_call"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="呼叫"
+                    android:textColor="@color/main_color"
+                    android:textSize="32sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_voice_call"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="240dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/sky_call_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@color/white"
+                    android:textSize="32sp" />
+
+                <TextView
+                    android:id="@+id/sky_voice_call_calling_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@color/white"
+                    android:textSize="32sp" />
+            </LinearLayout>
+
+            <!--呼出-->
+            <LinearLayout
+                android:id="@+id/sky_voice_call_outgoing"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="80dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:visibility="visible">
+
+                <Chronometer
+                    android:id="@+id/sky_voice_call_timer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="00:00"
+                    android:textColor="@color/white"
+                    android:textSize="24sp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp">
+                    <ImageView
+                        android:id="@+id/sky_voice_call_hangup"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:src="@drawable/selector_call_hangup" />
+
+                    <ImageView
+                        android:id="@+id/sky_call_speaker_on"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_marginStart="40dp"
+                        android:src="@drawable/ic_speaker_on"
+                        android:visibility="gone"/>
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!--来电-->
+            <LinearLayout
+                android:id="@+id/sky_voice_call_incoming"
+                android:layout_width="match_parent"
+                android:layout_height="140dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="80dp"
+                android:gravity="bottom"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="2" />
+
+                <ImageView
+                    android:id="@+id/sky_voice_call_ring_reject"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/selector_call_hangup" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:id="@+id/sky_voice_call_ring_pickup_audio"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/selector_call_answer" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="2" />
+            </LinearLayout>
+        </RelativeLayout>
+    </FrameLayout>
+</layout>

+ 10 - 0
android_host/src/main/h10_wke_1h/res/layout-land/spinner_item.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:singleLine="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:padding="4dp"
+    android:ellipsize="marquee"
+    android:textAlignment="inherit"
+    android:textSize="24sp"/>

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

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

+ 46 - 0
android_host/src/main/h10_wke_1h/res/layout-land/update_tips_dialog.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/update_tip_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:padding="8dp"
+        android:text="@string/detect_new_version"
+        android:textColor="@color/red_color"
+        android:textSize="32sp"
+        android:gravity="center" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp">
+        <Button
+            android:id="@+id/confirm_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_bottom_btn"
+            android:padding="8dp"
+            android:text="@string/str_confirm"
+            android:textSize="20sp"
+            android:textColor="@drawable/selector_bottom_btn_text_color"/>
+
+        <Button
+            android:id="@+id/cancel_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:background="@drawable/bg_bottom_btn"
+            android:padding="8dp"
+            android:text="@string/str_cancel"
+            android:textSize="20sp"
+            android:textColor="@drawable/selector_bottom_btn_text_color"/>
+
+    </LinearLayout>
+
+</LinearLayout>

+ 27 - 0
android_host/src/main/h10_wke_1h/res/layout-land/warning_dialog_lay.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/warnig_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:padding="8dp"
+        android:text="@string/reboot_conform"
+        android:textSize="32sp"
+        android:gravity="center" />
+
+    <Button
+        android:id="@+id/confirm_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:padding="8dp"
+        android:text="@string/str_confirm" />
+</LinearLayout>

+ 160 - 0
android_host/src/main/h10_wke_1h/res/layout-land/window_call_calls.xml

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/call_the_patient_bed_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="05房04床"
+                    android:textSize="5dp" />
+
+                <TextView
+                    android:id="@+id/call_the_patient_sex_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="30dp"
+                    android:text="男"
+                    android:textSize="5dp" />
+
+                <TextView
+                    android:id="@+id/call_the_patient_age_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="30岁"
+                    android:textSize="5dp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/call_the_patient_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="20dp"
+                android:text="老王"
+                android:textSize="10dp" />
+
+            <LinearLayout
+                android:layout_width="60dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/the_nursing_level_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="特技"
+                    android:textSize="5dp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="60dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/responsibility_for_the_doctor_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="责任医生:李医生"
+                    android:textSize="5dp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="60dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/charge_nurse_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="责任护士:李护士"
+                    android:textSize="5dp" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/call_duration_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="30dp"
+                android:layout_gravity="center_horizontal"
+                android:text="00:09"
+                android:textSize="5dp" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/hang_up_the_voice_linlyout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:background="#000000" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="5dp"
+                        android:text="挂断"
+                        android:textSize="5dp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/answer_the_voice_linlyout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="50dp"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:background="#000000" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="5dp"
+                        android:text="接听"
+                        android:textSize="5dp" />
+                </LinearLayout>
+
+            </LinearLayout>
+        </LinearLayout>
+    </RelativeLayout>
+</layout>

+ 34 - 0
android_host/src/main/h10_wke_1h/res/layout-land/window_incident.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="680dp"
+        android:layout_height="360dp"
+        android:background="@drawable/alert_window_bg">
+
+        <TextView
+            android:id="@+id/view_event_title"
+            android:layout_width="680dp"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:gravity="center"
+            android:text="@string/new_event_title"
+            android:textColor="@color/color_red"
+            android:textSize="48sp"/>
+
+        <LinearLayout
+            android:layout_width="680dp"
+            android:layout_height="280dp"
+            android:layout_marginTop="80dp"
+            android:gravity="center">
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_event_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scrollbars="vertical"
+                android:scrollbarSize="10dp"
+                android:fadeScrollbars="false"
+                android:scrollbarStyle="insideOverlay"/>
+        </LinearLayout>
+
+    </FrameLayout>
+</layout>

+ 176 - 0
android_host/src/main/h10_wke_1h/res/layout-land/window_video_call.xml

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools">
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <RelativeLayout
+            android:layout_width="50dp"
+            android:layout_height="30dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/head_imagv"
+                    android:layout_width="6dp"
+                    android:layout_height="6dp"
+                    android:background="#000000" />
+
+                <LinearLayout
+                    android:id="@+id/data_linlayout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/video_call_bed_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="2dp"
+                        android:text="5房3床"
+                        android:textSize="5dp" />
+
+                    <TextView
+                        android:id="@+id/video_call_sex_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="2dp"
+                        android:text="性别"
+                        android:textSize="5dp" />
+
+                    <TextView
+                        android:id="@+id/video_call_age_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="2dp"
+                        android:text="年龄"
+                        android:textSize="5dp" />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/video_call_name_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/data_linlayout"
+                    android:gravity="center_horizontal"
+                    android:text="老王"
+                    android:textSize="8dp"
+                    tools:ignore="NotSibling" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/bottom_relalyout"
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:layout_alignParentBottom="true">
+
+                <TextView
+                    android:id="@+id/video_call_the_nursing_level_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="护理级别:特技"
+                    android:textSize="4dp" />
+
+            </RelativeLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/video_call_responsibility_for_the_doctor_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="责任医生:李医生"
+                android:textSize="5dp" />
+
+            <TextView
+                android:id="@+id/video_call_charge_nurse_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="责任护士:李护士"
+                android:textSize="5dp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="20dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/video_call_time_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="30dp"
+                android:text="00:09"
+                android:textSize="5dp" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/hang_up_the_video_call_linlyout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:background="#000000" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="5dp"
+                        android:text="挂断"
+                        android:textSize="5dp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/connect_a_video_call_linlyout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="50dp"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:background="#000000" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="5dp"
+                        android:text="接听"
+                        android:textSize="5dp" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+    </RelativeLayout>
+</layout>

+ 42 - 0
android_host/src/main/h10_wke_1h/res/layout-land/window_visiting.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="460dp"
+        android:layout_height="140dp"
+        android:background="@drawable/alert_window_bg">
+
+        <LinearLayout
+            android:layout_width="460dp"
+            android:layout_height="140dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/window_visiting_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:padding="8dp"
+                android:text=""
+                android:textSize="24sp"/>
+
+            <Chronometer
+                android:id="@+id/window_visiting_time"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textSize="24sp"/>
+
+            <ImageView
+                android:id="@+id/window_visiting_end"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/av_hangup_selector"
+                android:layout_weight="1"/>
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+
+</layout>

+ 136 - 134
android_host/src/main/h10_wke_1h/res/layout/activity_sip_home.xml

@@ -1,166 +1,168 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
+
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/javashop_color_white">
+
+        <RelativeLayout
+            android:id="@+id/title_relayout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/javashop_color_white">
+            android:layout_height="60dp">
 
-            <RelativeLayout
-                android:id="@+id/title_relayout"
-                android:layout_width="match_parent"
-                android:layout_height="54dp">
+            <TextView
+                android:id="@+id/sip_name"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="10dp"
+                android:gravity="center"
+                android:text="sip:"
+                android:textColor="#2F9DF1"
+                android:textSize="28sp" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:format12Hour="yyyy-MM-dd HH:mm EEEE"
+                android:format24Hour="yyyy-MM-dd HH:mm EEEE"
+                android:textColor="#2F9DF1"
+                android:textSize="26sp" />
 
-                <TextView
-                    android:id="@+id/sip_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
-                    android:gravity="center"
-                    android:text="sip:"
-                    android:textColor="#2F9DF1"
-                    android:textSize="28sp" />
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:gravity="center">
 
-                <TextClock
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_centerVertical="true"
-                    android:format12Hour="yyyy-MM-dd HH:mm EEEE"
-                    android:format24Hour="yyyy-MM-dd HH:mm EEEE"
-                    android:textColor="#2F9DF1"
-                    android:textSize="26sp" />
-
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_alignParentRight="true"
-                    android:gravity="center">
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
 
-                    <LinearLayout
+                    <ImageView
+                        android:id="@+id/battery_state_img"
+                        android:layout_width="28dp"
+                        android:layout_height="28dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="10dp"
+                        android:src="@drawable/wdkl_stat_sys_battery" />
+
+                    <!--   蓝牙状态  -->
+                    <ImageView
+                        android:id="@+id/bluetooth_state_imagev"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical">
-
-                        <ImageView
-                            android:id="@+id/battery_state_img"
-                            android:layout_width="28dp"
-                            android:layout_height="28dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginRight="10dp"
-                            android:src="@drawable/wdkl_stat_sys_battery"/>
-
-                        <!--   蓝牙状态  -->
-                        <ImageView
-                            android:id="@+id/bluetooth_state_imagev"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="16dp"
-                            android:visibility="gone"/>
-                        <!--   WiFi状态  -->
-                        <ImageView
-                            android:id="@+id/wifi_state_imagev"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="16dp" />
-
-                        <!-- 以太网 -->
-                        <ImageView
-                            android:id="@+id/ethernet_state_imagev"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="16dp" />
-
-                    </LinearLayout>
-                </RelativeLayout>
+                        android:layout_marginRight="16dp"
+                        android:visibility="gone" />
+                    <!--   WiFi状态  -->
+                    <ImageView
+                        android:id="@+id/wifi_state_imagev"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="16dp" />
+
+                    <!-- 以太网 -->
+                    <ImageView
+                        android:id="@+id/ethernet_state_imagev"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="16dp" />
+
+                </LinearLayout>
             </RelativeLayout>
+        </RelativeLayout>
 
-            <LinearLayout
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottom_linlyout"
+            android:layout_below="@+id/title_relayout">
+
+            <FrameLayout
+                android:id="@+id/middle_fralyout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_above="@+id/bottom_linlyout"
-                android:layout_below="@+id/title_relayout">
+                android:layout_height="match_parent" />
 
-                <FrameLayout
-                    android:id="@+id/middle_fralyout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
+        </LinearLayout>
 
-            </LinearLayout>
+        <!--<FrameLayout
+            android:id="@+id/right_fralyout"
+            android:layout_width="480dp"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottom_linlyout"
+            android:layout_below="@+id/title_relayout"
+            android:layout_alignParentRight="true"/>-->
 
-            <FrameLayout
-                android:id="@+id/right_fralyout"
-                android:layout_width="480dp"
-                android:layout_height="match_parent"
-                android:layout_above="@+id/bottom_linlyout"
-                android:layout_below="@+id/title_relayout"
-                android:layout_alignParentRight="true"/>
+        <LinearLayout
+            android:id="@+id/bottom_linlyout"
+            android:layout_width="match_parent"
+            android:layout_height="68dp"
+            android:layout_alignParentBottom="true"
+            android:background="#2F9DF1"
+            android:orientation="horizontal">
 
             <LinearLayout
-                android:id="@+id/bottom_linlyout"
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_alignParentBottom="true"
-                android:background="#2F9DF1"
+                android:layout_height="match_parent"
                 android:orientation="horizontal">
 
-                <LinearLayout
+                <RadioGroup
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:orientation="horizontal">
 
-                    <RadioGroup
-                        android:layout_width="match_parent"
+                    <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                        android:id="@+id/home_radio_bt"
+                        android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:orientation="horizontal">
-
-                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
-                            android:id="@+id/home_radio_bt"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:button="@null"
-                            android:drawableLeft="@drawable/shou_ye_no"
-                            android:drawablePadding="10px"
-                            android:gravity="center"
-                            android:textColor="@drawable/selector_bottom_btn_text_color"
-                            android:text="@string/str_home"
-                            android:textSize="24sp" />
-
-                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
-                            android:id="@+id/sip_device_radio_bt"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:button="@null"
-                            android:drawableLeft="@drawable/selt_other_host_icon"
-                            android:drawablePadding="10px"
-                            android:gravity="center"
-                            android:textColor="@drawable/selector_bottom_btn_text_color"
-                            android:text="设备管理"
-                            android:textSize="24sp" />
-
-                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton
-                            android:id="@+id/system_settings_radio_bt"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:button="@null"
-                            android:drawableLeft="@drawable/selt_set_icon"
-                            android:drawablePadding="10px"
-                            android:gravity="center"
-                            android:textColor="@drawable/selector_bottom_btn_text_color"
-                            android:text="@string/str_settings"
-                            android:textSize="24sp" />
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="5"/>
-
-                    </RadioGroup>
-                </LinearLayout>
+                        android:layout_weight="1"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/ic_home_new"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:text="@string/str_home"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+                        android:textSize="28sp" />
+
+                    <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                        android:id="@+id/sip_device_radio_bt"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/ic_settings_new"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:text="设置"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+                        android:textSize="28sp" />
+
+                    <com.wdkl.ncs.android.lib.widget.CustomRadioButton
+                        android:id="@+id/system_settings_radio_bt"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/selt_set_icon"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:text="@string/str_settings"
+                        android:textColor="@drawable/selector_bottom_btn_text_color"
+                        android:textSize="28sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5" />
+
+                </RadioGroup>
             </LinearLayout>
+        </LinearLayout>
 
         <!--通话界面-->
         <FrameLayout

+ 197 - 122
android_host/src/main/h10_wke_1h/res/layout/fragment_device_manage.xml

@@ -3,152 +3,227 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#EAF2F9">
+        android:background="#EAF2F9"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1.5"
-            android:layout_marginTop="20dp"
-            android:padding="10dp">
-
-            <RadioGroup
-                android:id="@+id/group_devices"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <RadioButton
-                    android:id="@+id/rb_host_device"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="20dp"
-                    android:background="@drawable/selector_button_bg_color"
-                    android:button="@null"
-                    android:gravity="center"
-                    android:text="本机"
-                    android:textSize="24sp"/>
-
-                <RadioButton
-                    android:id="@+id/rb_extension_device"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="20dp"
-                    android:background="@drawable/selector_button_bg_color"
-                    android:button="@null"
-                    android:gravity="center"
-                    android:text="分机"
-                    android:textSize="24sp"/>
-            </RadioGroup>
-        </LinearLayout>
-
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="5">
+            android:layout_width="match_parent"
+            android:layout_height="400dp">
 
             <LinearLayout
-                android:id="@+id/ll_host_device"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:gravity="center_horizontal"
-                android:layout_marginTop="10dp"
-                android:padding="20dp"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tv_host_sip"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="本机sip账号:"
-                    android:textSize="36sp" />
+                android:layout_marginTop="20dp"
+                android:layout_weight="1.5"
+                android:padding="10dp">
 
-                <Button
-                    android:id="@+id/btn_config"
-                    android:layout_width="wrap_content"
+                <RadioGroup
+                    android:id="@+id/group_devices"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="40dp"
-                    android:padding="10dp"
-                    android:background="@drawable/selector_button_bg_color2"
-                    android:text="修改账号"
-                    android:textSize="32sp"/>
+                    android:orientation="vertical">
 
+                    <RadioButton
+                        android:id="@+id/rb_host_device"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/selector_button_bg_color"
+                        android:button="@null"
+                        android:gravity="center"
+                        android:paddingTop="20dp"
+                        android:paddingBottom="20dp"
+                        android:text="本机账号"
+                        android:textSize="24sp" />
+
+                    <RadioButton
+                        android:id="@+id/rb_extension_device"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:background="@drawable/selector_button_bg_color"
+                        android:button="@null"
+                        android:gravity="center"
+                        android:paddingTop="20dp"
+                        android:paddingBottom="20dp"
+                        android:text="对方账号"
+                        android:textSize="24sp" />
+                </RadioGroup>
             </LinearLayout>
 
-            <RelativeLayout
-                android:id="@+id/ll_extension_devices"
-                android:layout_width="match_parent"
+            <FrameLayout
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:visibility="gone">
+                android:layout_weight="5">
 
-                <RelativeLayout
-                    android:id="@+id/ll_extension_configs"
-                    android:layout_width="200dp"
+                <LinearLayout
+                    android:id="@+id/ll_host_device"
+                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
                     android:padding="20dp"
-                    android:orientation="vertical">
+                    android:visibility="visible">
 
                     <TextView
-                        android:id="@+id/tv_select_device"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/tv_host_sip"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:textSize="24sp"
-                        android:text="--"/>
+                        android:text="本机SIP:"
+                        android:textSize="36sp" />
 
-                    <Button
-                        android:id="@+id/btn_add_device"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_above="@+id/btn_config_device"
-                        android:layout_marginTop="60dp"
-                        android:padding="10dp"
-                        android:layout_centerHorizontal="true"
-                        android:background="@drawable/selector_button_bg_color2"
-                        android:text="添加设备"
-                        android:textSize="28sp"/>
-
-                    <Button
-                        android:id="@+id/btn_config_device"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_above="@+id/btn_delete_device"
                         android:layout_marginTop="40dp"
-                        android:padding="10dp"
-                        android:layout_centerHorizontal="true"
-                        android:background="@drawable/selector_button_bg_color2"
-                        android:text="修改设备"
-                        android:textSize="28sp"/>
-
-                    <Button
-                        android:id="@+id/btn_delete_device"
-                        android:layout_width="wrap_content"
+                        android:gravity="center_horizontal">
+
+                        <Button
+                            android:id="@+id/btn_host_ip_config"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/selector_button_bg_color2"
+                            android:padding="10dp"
+                            android:text="修改账号"
+                            android:textSize="32sp" />
+
+                        <!--<Button
+                            android:id="@+id/btn_host_ip_delete"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="20dp"
+                            android:background="@drawable/selector_button_bg_color2"
+                            android:padding="10dp"
+                            android:text="删除账号"
+                            android:textSize="32sp" />-->
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_extension_devices"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    android:padding="20dp"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/tv_target_device_sip"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="对方SIP:"
+                        android:textSize="36sp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
                         android:layout_marginTop="40dp"
-                        android:layout_marginBottom="40dp"
-                        android:padding="10dp"
-                        android:layout_centerHorizontal="true"
-                        android:background="@drawable/selector_button_bg_color2"
-                        android:text="删除设备"
-                        android:textSize="28sp"/>
+                        android:gravity="center_horizontal">
 
-                </RelativeLayout>
+                        <Button
+                            android:id="@+id/btn_config_device"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/selector_button_bg_color2"
+                            android:padding="10dp"
+                            android:text="修改账号"
+                            android:textSize="32sp" />
 
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rv_extension_devices"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_toLeftOf="@id/ll_extension_configs"
-                    android:background="#EAF2F9"
-                    android:padding="20dp"/>
-            </RelativeLayout>
-        </FrameLayout>
+                    </LinearLayout>
+
+                </LinearLayout>
+            </FrameLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_system_settings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:gravity="center"
+                android:background="@color/white"
+                android:text="@string/system_settings"
+                android:textColor="#000000"
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/tv_restart"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:gravity="center"
+                android:background="@color/white"
+                android:text="@string/register_reboot"
+                android:textColor="#000000"
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/tv_sip_test"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:gravity="center"
+                android:background="@color/white"
+                android:text="SIP test"
+                android:textColor="#000000"
+                android:textSize="24sp"
+                android:visibility="gone"/>
+
+            <TextView
+                android:id="@+id/tv_app_version_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:gravity="center"
+                android:background="@color/white"
+                android:text="v1.0"
+                android:textColor="#000000"
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/tv_device_sip_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:padding="8dp"
+                android:gravity="center"
+                android:text="sip:"
+                android:textColor="#000000"
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/tv_device_ip_address"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:padding="8dp"
+                android:gravity="center"
+                android:textColor="#000000"
+                android:textSize="24sp"
+                android:text="IP:"/>
+
+        </LinearLayout>
 
     </LinearLayout>
 

+ 71 - 0
android_host/src/main/h10_wke_1h/res/layout/fragment_home_call.xml

@@ -0,0 +1,71 @@
+<?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:gravity="center"
+        android:background="@drawable/main_bg_800x1280">
+
+        <Button
+            android:id="@+id/sip_call_voice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="240dp"
+            android:padding="20dp"
+            android:background="@drawable/round_button"
+            android:text="语音"
+            android:textColor="@drawable/selector_button_text_color"
+            android:textSize="36sp"/>
+
+        <Button
+            android:id="@+id/sip_call_video"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="240dp"
+            android:layout_marginStart="60dp"
+            android:padding="20dp"
+            android:background="@drawable/round_button"
+            android:text="视频"
+            android:textColor="@drawable/selector_button_text_color"
+            android:textSize="36sp"/>
+
+        <!--<TextView
+            android:id="@+id/sip_call_voice_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="100dp"
+            android:background="#B4B4B4"
+            android:drawableLeft="@drawable/ic_voice_callout"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:drawablePadding="20dp"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:singleLine="true"
+            android:text="@string/voice_call"
+            android:textColor="@drawable/selector_action_button_text_color"
+            android:textSize="32sp" />
+
+        <TextView
+            android:id="@+id/sip_call_video_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="100dp"
+            android:layout_marginTop="40dp"
+            android:background="#B4B4B4"
+            android:drawableLeft="@drawable/ic_video_callout"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:drawablePadding="20dp"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:singleLine="true"
+            android:text="@string/video_call"
+            android:textColor="@drawable/selector_action_button_text_color"
+            android:textSize="32sp" />-->
+    </LinearLayout>
+
+</layout>

+ 58 - 11
android_host/src/main/h10_wke_1h/res/layout/sip_call_layout.xml

@@ -1,9 +1,9 @@
 <?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="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray_deep">
+        android:background="@mipmap/call_bg">
 
         <RelativeLayout
             android:id="@+id/video_call_view"
@@ -23,9 +23,9 @@
                 android:id="@+id/local_video_frame"
                 android:layout_width="200dp"
                 android:layout_height="240dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginRight="10dp"
-                android:layout_alignParentRight="true" />
+                android:layout_marginTop="100dp"
+                android:layout_marginStart="20dp"
+                android:layout_alignParentStart="true" />
         </RelativeLayout>
 
         <LinearLayout
@@ -65,23 +65,24 @@
                 android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/sky_call_name"
+                    android:id="@+id/sky_voice_call_calling_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
                     android:gravity="center"
                     android:text=""
                     android:textColor="@color/white"
                     android:textSize="32sp" />
 
                 <TextView
-                    android:id="@+id/sky_voice_call_calling_text"
+                    android:id="@+id/sky_call_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
                     android:gravity="center"
                     android:text=""
                     android:textColor="@color/white"
                     android:textSize="32sp" />
+
             </LinearLayout>
 
             <!--呼出-->
@@ -109,6 +110,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="32dp">
+
+                    <ImageView
+                        android:id="@+id/sky_voice_call_mute"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_marginRight="40dp"
+                        android:src="@drawable/av_mute_selector"
+                        android:visibility="gone"/>
+
                     <ImageView
                         android:id="@+id/sky_voice_call_hangup"
                         android:layout_width="100dp"
@@ -116,11 +126,11 @@
                         android:src="@drawable/selector_call_hangup" />
 
                     <ImageView
-                        android:id="@+id/sky_call_speaker_on"
+                        android:id="@+id/sky_voice_call_speaker"
                         android:layout_width="100dp"
                         android:layout_height="100dp"
-                        android:layout_marginStart="40dp"
-                        android:src="@drawable/ic_speaker_on"
+                        android:layout_marginLeft="40dp"
+                        android:src="@drawable/av_speaker_selector"
                         android:visibility="gone"/>
                 </LinearLayout>
 
@@ -165,6 +175,43 @@
                     android:layout_height="1dp"
                     android:layout_weight="2" />
             </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_voice_volume_bar"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="120dp"
+                android:layout_marginTop="100dp"
+                android:layout_marginBottom="100dp"
+                android:clipChildren="true"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:visibility="gone">
+                <TextView
+                    android:id="@+id/tv_volume"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:textSize="24sp"
+                    android:textColor="@color/title_text"/>
+
+                <com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper
+                    android:layout_width="24dp"
+                    android:layout_height="match_parent">
+                    <com.wdkl.ncs.android.lib.widget.VerticalSeekBar
+                        android:id="@+id/call_volume_bar"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:padding="8dp"
+                        android:max="10"
+                        android:progress="6"
+                        android:splitTrack="false"
+                        android:progressDrawable="@drawable/seek_bar_bg"
+                        android:thumb="@drawable/seek_bar_thumb"
+                        app:seekBarRotation="CW270" /> <!-- Rotation: CW90 or CW270 -->
+                </com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper>
+            </LinearLayout>
         </RelativeLayout>
     </FrameLayout>
 </layout>

+ 1 - 1
android_host/src/main/h10_wke_1h/res/values/strings.xml

@@ -1,4 +1,4 @@
 <resources>
     <string name="app_name">NurseHome</string>
-    <string name="wdkl_app_name">SIP主机端</string>
+    <string name="wdkl_app_name">呼叫对讲</string>
 </resources>

+ 28 - 3
app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -1,5 +1,6 @@
 package com.wdkl.app.ncs.application
 
+import android.app.Activity
 import android.content.Context
 import android.content.res.Configuration
 import android.hardware.Camera
@@ -17,6 +18,9 @@ import com.wdkl.ncs.android.component.nursehome.util.NetHelper
 import com.wdkl.ncs.android.component.nursehome.util.XCrashUtils
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.middleware.common.Constants
+import me.jessyan.autosize.AutoSizeConfig
+import me.jessyan.autosize.onAdaptListener
+import me.jessyan.autosize.utils.ScreenUtils
 import java.io.PrintWriter
 
 /**
@@ -65,9 +69,30 @@ class Application : BaseApplication() {
      * @return rx观察者
      */
     private fun initLeaks() {
-//        if (JavaShopConfigCenter.INSTANCE.APP_DEV) {
-//            LeakCanary.install(this)
-//        }
+        //AndroidAutoSize的自适应问题 这里主要是横竖屏不同尺寸下大的自适应
+        //屏幕适配监听器
+        AutoSizeConfig.getInstance().onAdaptListener = object : onAdaptListener {
+            override fun onAdaptBefore(target: Any, activity: Activity) {
+                //使用以下代码, 可以解决横竖屏切换时的屏幕适配问题
+                //首先设置最新的屏幕尺寸,ScreenUtils.getScreenSize(activity) 的参数一定不要传 Application !!!
+                AutoSizeConfig.getInstance().screenWidth = ScreenUtils.getScreenSize(activity)[0]
+                AutoSizeConfig.getInstance().screenHeight = ScreenUtils.getScreenSize(activity)[1]
+                //根据屏幕方向,设置设计尺寸
+                if (activity.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                    //设置横屏设计尺寸
+                    AutoSizeConfig.getInstance()
+                        .setDesignWidthInDp(1024).designHeightInDp = 600
+                } else {
+                    //设置竖屏设计尺寸
+                    AutoSizeConfig.getInstance()
+                        .setDesignWidthInDp(600).designHeightInDp = 1024
+                }
+            }
+
+            override fun onAdaptAfter(target: Any, activity: Activity) {
+                //
+            }
+        }
     }
 
     /**

+ 403 - 0
common/src/main/code/com/wdkl/ncs/android/lib/widget/VerticalSeekBar.java

@@ -0,0 +1,403 @@
+/*
+ *    Copyright (C) 2015 Haruki Hasegawa
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/* This file contains AOSP code copied from /frameworks/base/core/java/android/widget/AbsSeekBar.java */
+/*============================================================================*/
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*============================================================================*/
+
+package com.wdkl.ncs.android.lib.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.support.v4.view.ViewCompat;
+import android.support.v7.widget.AppCompatSeekBar;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.ProgressBar;
+
+import com.wdkl.ncs.android.lib.R;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class VerticalSeekBar extends AppCompatSeekBar {
+    public static final int ROTATION_ANGLE_CW_90 = 90;
+    public static final int ROTATION_ANGLE_CW_270 = 270;
+
+    private boolean mIsDragging;
+    private Drawable mThumb_;
+    private Method mMethodSetProgressFromUser;
+    private int mRotationAngle = ROTATION_ANGLE_CW_90;
+
+    public VerticalSeekBar(Context context) {
+        super(context);
+        initialize(context, null, 0, 0);
+    }
+
+    public VerticalSeekBar(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs, 0, 0);
+    }
+
+    public VerticalSeekBar(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initialize(context, attrs, defStyle, 0);
+    }
+
+    private void initialize(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        ViewCompat.setLayoutDirection(this, ViewCompat.LAYOUT_DIRECTION_LTR);
+
+        if (attrs != null) {
+            TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.VerticalSeekBar, defStyleAttr, defStyleRes);
+            final int rotationAngle = a.getInteger(R.styleable.VerticalSeekBar_seekBarRotation, 0);
+            if (isValidRotationAngle(rotationAngle)) {
+                mRotationAngle = rotationAngle;
+            }
+            a.recycle();
+        }
+    }
+
+    @Override
+    public void setThumb(Drawable thumb) {
+        mThumb_ = thumb;
+        super.setThumb(thumb);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (useViewRotation()) {
+            return onTouchEventUseViewRotation(event);
+        } else {
+            return onTouchEventTraditionalRotation(event);
+        }
+    }
+
+    private boolean onTouchEventTraditionalRotation(MotionEvent event) {
+        if (!isEnabled()) {
+            return false;
+        }
+
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                setPressed(true);
+                onStartTrackingTouch();
+                trackTouchEvent(event);
+                attemptClaimDrag(true);
+                invalidate();
+                break;
+
+            case MotionEvent.ACTION_MOVE:
+                if (mIsDragging) {
+                    trackTouchEvent(event);
+                }
+                break;
+
+            case MotionEvent.ACTION_UP:
+                if (mIsDragging) {
+                    trackTouchEvent(event);
+                    onStopTrackingTouch();
+                    setPressed(false);
+                } else {
+                    // Touch up when we never crossed the touch slop threshold
+                    // should
+                    // be interpreted as a tap-seek to that location.
+                    onStartTrackingTouch();
+                    trackTouchEvent(event);
+                    onStopTrackingTouch();
+                    attemptClaimDrag(false);
+                }
+                // ProgressBar doesn't know to repaint the thumb drawable
+                // in its inactive state when the touch stops (because the
+                // value has not apparently changed)
+                invalidate();
+                break;
+
+            case MotionEvent.ACTION_CANCEL:
+                if (mIsDragging) {
+                    onStopTrackingTouch();
+                    setPressed(false);
+                }
+                invalidate(); // see above explanation
+                break;
+        }
+        return true;
+    }
+
+    private boolean onTouchEventUseViewRotation(MotionEvent event) {
+        boolean handled = super.onTouchEvent(event);
+
+        if (handled) {
+            int action = event.getAction();
+            switch (action) {
+                case MotionEvent.ACTION_DOWN:
+                    attemptClaimDrag(true);
+                    break;
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    attemptClaimDrag(false);
+                    break;
+            }
+        }
+
+        return handled;
+    }
+
+    private void trackTouchEvent(MotionEvent event) {
+        final int paddingLeft = super.getPaddingLeft();
+        final int paddingRight = super.getPaddingRight();
+        final int height = getHeight();
+
+        final int available = height - paddingLeft - paddingRight;
+        int y = (int) event.getY();
+
+        final float scale;
+        float value = 0;
+
+        switch (mRotationAngle) {
+            case ROTATION_ANGLE_CW_90:
+                value = y - paddingLeft;
+                break;
+            case ROTATION_ANGLE_CW_270:
+                value = (height - paddingLeft) - y;
+                break;
+        }
+
+        if (value < 0 || available == 0) {
+            scale = 0.0f;
+        } else if (value > available) {
+            scale = 1.0f;
+        } else {
+            scale = value / (float) available;
+        }
+
+        final int max = getMax();
+        final float progress = scale * max;
+
+        _setProgressFromUser((int) progress, true);
+    }
+
+    /**
+     * Tries to claim the user's drag motion, and requests disallowing any
+     * ancestors from stealing events in the drag.
+     */
+    private void attemptClaimDrag(boolean active) {
+        final ViewParent parent = getParent();
+        if (parent != null) {
+            parent.requestDisallowInterceptTouchEvent(active);
+        }
+    }
+
+    /**
+     * This is called when the user has started touching this widget.
+     */
+    private void onStartTrackingTouch() {
+        mIsDragging = true;
+    }
+
+    /**
+     * This is called when the user either releases his touch or the touch is
+     * canceled.
+     */
+    private void onStopTrackingTouch() {
+        mIsDragging = false;
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (isEnabled()) {
+            final boolean handled;
+            int direction = 0;
+
+            switch (keyCode) {
+                case KeyEvent.KEYCODE_DPAD_DOWN:
+                    direction = (mRotationAngle == ROTATION_ANGLE_CW_90) ? 1 : -1;
+                    handled = true;
+                    break;
+                case KeyEvent.KEYCODE_DPAD_UP:
+                    direction = (mRotationAngle == ROTATION_ANGLE_CW_270) ? 1 : -1;
+                    handled = true;
+                    break;
+                case KeyEvent.KEYCODE_DPAD_LEFT:
+                case KeyEvent.KEYCODE_DPAD_RIGHT:
+                    // move view focus to previous/next view
+                    return false;
+                default:
+                    handled = false;
+                    break;
+            }
+
+            if (handled) {
+                final int keyProgressIncrement = getKeyProgressIncrement();
+                int progress = getProgress();
+
+                progress += (direction * keyProgressIncrement);
+
+                if (progress >= 0 && progress <= getMax()) {
+                    _setProgressFromUser(progress, true);
+                }
+
+                return true;
+            }
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public synchronized void setProgress(int progress) {
+        super.setProgress(progress);
+        if (!useViewRotation()) {
+            refreshThumb();
+        }
+    }
+
+    private synchronized void _setProgressFromUser(int progress, boolean fromUser) {
+        if (mMethodSetProgressFromUser == null) {
+            try {
+                Method m;
+                m = ProgressBar.class.getDeclaredMethod("setProgress", int.class, boolean.class);
+                m.setAccessible(true);
+                mMethodSetProgressFromUser = m;
+            } catch (NoSuchMethodException e) {
+            }
+        }
+
+        if (mMethodSetProgressFromUser != null) {
+            try {
+                mMethodSetProgressFromUser.invoke(this, progress, fromUser);
+            } catch (IllegalArgumentException e) {
+            } catch (IllegalAccessException e) {
+            } catch (InvocationTargetException e) {
+            }
+        } else {
+            super.setProgress(progress);
+        }
+        refreshThumb();
+    }
+
+    @Override
+    protected synchronized void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (useViewRotation()) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        } else {
+            super.onMeasure(heightMeasureSpec, widthMeasureSpec);
+
+            final ViewGroup.LayoutParams lp = getLayoutParams();
+
+            if (isInEditMode() && (lp != null) && (lp.height >= 0)) {
+                setMeasuredDimension(super.getMeasuredHeight(), lp.height);
+            } else {
+                setMeasuredDimension(super.getMeasuredHeight(), super.getMeasuredWidth());
+            }
+        }
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        if (useViewRotation()) {
+            super.onSizeChanged(w, h, oldw, oldh);
+        } else {
+            super.onSizeChanged(h, w, oldh, oldw);
+        }
+    }
+
+    @Override
+    protected synchronized void onDraw(Canvas canvas) {
+        if (!useViewRotation()) {
+            switch (mRotationAngle) {
+                case ROTATION_ANGLE_CW_90:
+                    canvas.rotate(90);
+                    canvas.translate(0, -super.getWidth());
+                    break;
+                case ROTATION_ANGLE_CW_270:
+                    canvas.rotate(-90);
+                    canvas.translate(-super.getHeight(), 0);
+                    break;
+            }
+        }
+
+        super.onDraw(canvas);
+    }
+
+    public int getRotationAngle() {
+        return mRotationAngle;
+    }
+
+    public void setRotationAngle(int angle) {
+        if (!isValidRotationAngle(angle)) {
+            throw new IllegalArgumentException("Invalid angle specified :" + angle);
+        }
+
+        if (mRotationAngle == angle) {
+            return;
+        }
+
+        mRotationAngle = angle;
+
+        if (useViewRotation()) {
+            VerticalSeekBarWrapper wrapper = getWrapper();
+            if (wrapper != null) {
+                wrapper.applyViewRotation();
+            }
+        } else {
+            requestLayout();
+        }
+    }
+
+    // refresh thumb position
+    private void refreshThumb() {
+        onSizeChanged(super.getWidth(), super.getHeight(), 0, 0);
+    }
+
+    /*package*/ boolean useViewRotation() {
+        return !isInEditMode();
+    }
+
+    private VerticalSeekBarWrapper getWrapper() {
+        final ViewParent parent = getParent();
+
+        if (parent instanceof VerticalSeekBarWrapper) {
+            return (VerticalSeekBarWrapper) parent;
+        } else {
+            return null;
+        }
+    }
+
+    private static boolean isValidRotationAngle(int angle) {
+        return (angle == ROTATION_ANGLE_CW_90 || angle == ROTATION_ANGLE_CW_270);
+    }
+}

+ 189 - 0
common/src/main/code/com/wdkl/ncs/android/lib/widget/VerticalSeekBarWrapper.java

@@ -0,0 +1,189 @@
+/*
+ *    Copyright (C) 2015 Haruki Hasegawa
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.wdkl.ncs.android.lib.widget;
+
+import android.content.Context;
+import android.support.v4.view.ViewCompat;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+public class VerticalSeekBarWrapper extends FrameLayout {
+    public VerticalSeekBarWrapper(Context context) {
+        this(context, null, 0);
+    }
+
+    public VerticalSeekBarWrapper(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public VerticalSeekBarWrapper(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        if (useViewRotation()) {
+            onSizeChangedUseViewRotation(w, h, oldw, oldh);
+        } else {
+            onSizeChangedTraditionalRotation(w, h, oldw, oldh);
+        }
+    }
+
+    private void onSizeChangedTraditionalRotation(int w, int h, int oldw, int oldh) {
+        final VerticalSeekBar seekBar = getChildSeekBar();
+
+        if (seekBar != null) {
+            final int hPadding = getPaddingLeft() + getPaddingRight();
+            final int vPadding = getPaddingTop() + getPaddingBottom();
+            final LayoutParams lp = (LayoutParams) seekBar.getLayoutParams();
+
+            lp.width = ViewGroup.LayoutParams.WRAP_CONTENT;
+            lp.height = Math.max(0, h - vPadding);
+            seekBar.setLayoutParams(lp);
+
+            seekBar.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
+
+            final int seekBarMeasuredWidth = seekBar.getMeasuredWidth();
+            seekBar.measure(
+                    MeasureSpec.makeMeasureSpec(Math.max(0, w - hPadding), MeasureSpec.AT_MOST),
+                    MeasureSpec.makeMeasureSpec(Math.max(0, h - vPadding), MeasureSpec.EXACTLY));
+
+            lp.gravity = Gravity.TOP | Gravity.LEFT;
+            lp.leftMargin = (Math.max(0, w - hPadding) - seekBarMeasuredWidth) / 2;
+            seekBar.setLayoutParams(lp);
+        }
+
+        super.onSizeChanged(w, h, oldw, oldh);
+    }
+
+    private void onSizeChangedUseViewRotation(int w, int h, int oldw, int oldh) {
+        final VerticalSeekBar seekBar = getChildSeekBar();
+
+        if (seekBar != null) {
+            final int hPadding = getPaddingLeft() + getPaddingRight();
+            final int vPadding = getPaddingTop() + getPaddingBottom();
+            seekBar.measure(
+                    MeasureSpec.makeMeasureSpec(Math.max(0, h - vPadding), MeasureSpec.EXACTLY),
+                    MeasureSpec.makeMeasureSpec(Math.max(0, w - hPadding), MeasureSpec.AT_MOST));
+        }
+
+        applyViewRotation(w, h);
+        super.onSizeChanged(w, h, oldw, oldh);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final VerticalSeekBar seekBar = getChildSeekBar();
+        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+        final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+
+        if ((seekBar != null) && (widthMode != MeasureSpec.EXACTLY)) {
+            final int seekBarWidth;
+            final int seekBarHeight;
+            final int hPadding = getPaddingLeft() + getPaddingRight();
+            final int vPadding = getPaddingTop() + getPaddingBottom();
+            final int innerContentWidthMeasureSpec = MeasureSpec.makeMeasureSpec(Math.max(0, widthSize - hPadding), widthMode);
+            final int innerContentHeightMeasureSpec = MeasureSpec.makeMeasureSpec(Math.max(0, heightSize - vPadding), heightMode);
+
+            if (useViewRotation()) {
+                seekBar.measure(innerContentHeightMeasureSpec, innerContentWidthMeasureSpec);
+                seekBarWidth = seekBar.getMeasuredHeight();
+                seekBarHeight = seekBar.getMeasuredWidth();
+            } else {
+                seekBar.measure(innerContentWidthMeasureSpec, innerContentHeightMeasureSpec);
+                seekBarWidth = seekBar.getMeasuredWidth();
+                seekBarHeight = seekBar.getMeasuredHeight();
+            }
+
+            final int measuredWidth = resolveSizeAndState(seekBarWidth + hPadding, widthMeasureSpec, 0);
+            final int measuredHeight = resolveSizeAndState(seekBarHeight + vPadding, heightMeasureSpec, 0);
+
+            setMeasuredDimension(measuredWidth, measuredHeight);
+        } else {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+    }
+
+    /*package*/ void applyViewRotation() {
+        applyViewRotation(getWidth(), getHeight());
+    }
+
+    private void applyViewRotation(int w, int h) {
+        final VerticalSeekBar seekBar = getChildSeekBar();
+
+        if (seekBar != null) {
+            final boolean isLTR = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_LTR;
+            final int rotationAngle = seekBar.getRotationAngle();
+            final int seekBarMeasuredWidth = seekBar.getMeasuredWidth();
+            final int seekBarMeasuredHeight = seekBar.getMeasuredHeight();
+            final int hPadding = getPaddingLeft() + getPaddingRight();
+            final int vPadding = getPaddingTop() + getPaddingBottom();
+            final float hOffset = (Math.max(0, w - hPadding) - seekBarMeasuredHeight) * 0.5f;
+            final ViewGroup.LayoutParams lp = seekBar.getLayoutParams();
+
+            lp.width = Math.max(0, h - vPadding);
+            lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+
+            seekBar.setLayoutParams(lp);
+
+            seekBar.setPivotX((isLTR) ? 0 : Math.max(0, h - vPadding));
+            seekBar.setPivotY(0);
+
+            switch (rotationAngle) {
+                case VerticalSeekBar.ROTATION_ANGLE_CW_90:
+                    seekBar.setRotation(90);
+                    if (isLTR) {
+                        seekBar.setTranslationX(seekBarMeasuredHeight + hOffset);
+                        seekBar.setTranslationY(0);
+                    } else {
+                        seekBar.setTranslationX(-hOffset);
+                        seekBar.setTranslationY(seekBarMeasuredWidth);
+                    }
+                    break;
+                case VerticalSeekBar.ROTATION_ANGLE_CW_270:
+                    seekBar.setRotation( 270);
+                    if (isLTR) {
+                        seekBar.setTranslationX(hOffset);
+                        seekBar.setTranslationY(seekBarMeasuredWidth);
+                    } else {
+                        seekBar.setTranslationX(-(seekBarMeasuredHeight + hOffset));
+                        seekBar.setTranslationY(0);
+                    }
+                    break;
+            }
+        }
+    }
+
+    private VerticalSeekBar getChildSeekBar() {
+        final View child = (getChildCount() > 0) ? getChildAt(0) : null;
+        return (child instanceof VerticalSeekBar) ? (VerticalSeekBar) child : null;
+    }
+
+    private boolean useViewRotation() {
+        final VerticalSeekBar seekBar = getChildSeekBar();
+        if (seekBar != null) {
+            return seekBar.useViewRotation();
+        } else {
+            return false;
+        }
+    }
+}

+ 9 - 0
common/src/main/res/values/attrs.xml

@@ -158,4 +158,13 @@
         <attr name="isShowDesc" format="boolean" />
         <attr name="haveChangeColor" format="boolean" />
     </declare-styleable>
+
+    <declare-styleable name="VerticalSeekBar">
+        <attr name="seekBarRotation">
+            <!-- Clock wise - 90 deg; top = min, bottom = max -->
+            <enum name="CW90" value="90" />
+            <!-- Clock wise - 270 deg; bottom = min, top = max -->
+            <enum name="CW270" value="270" />
+        </attr>
+    </declare-styleable>
 </resources>

+ 2 - 2
middleware/src/main/code/com/wdkl/ncs/android/middleware/helper/PassCheckDialogHelper.java

@@ -61,8 +61,8 @@ public class PassCheckDialogHelper {
             }
         });
         alertDialog = builder.create();
-        alertDialog.setCanceledOnTouchOutside(true);
-        alertDialog.setCancelable(true);
+        alertDialog.setCanceledOnTouchOutside(false);
+        alertDialog.setCancelable(false);
         alertDialog.show();
     }
 

+ 18 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/utils/CommonUtils.java

@@ -18,6 +18,8 @@ public class CommonUtils {
     private static final String KEY_SP_SIP_URL = "KEY_SP_SIP_URL";
     private static final String KEY_SP_SIP_PORT = "KEY_SP_SIP_PORT";
     private static final String KEY_SP_SIP_ACCOUNT = "KEY_SP_SIP_ACCOUNT";
+    private static final String KEY_SP_TARGET_SIP_ID = "KEY_SP_TARGET_SIP_ID";
+    private static final String KEY_SP_TARGET_SIP_IP = "KEY_SP_TARGET_SIP_IP";
 
     //默认ip端口
     //private static final String DEFAULT_URL = "8.129.220.143";
@@ -92,6 +94,22 @@ public class CommonUtils {
         getEditor(context).putString(KEY_SP_SIP_ACCOUNT, value).apply();
     }
 
+    public static String getTargetSipId(Context context) {
+        return getSP(context).getString(KEY_SP_TARGET_SIP_ID, "");
+    }
+
+    public static void setTargetSipId(Context context, String value) {
+        getEditor(context).putString(KEY_SP_TARGET_SIP_ID, value).apply();
+    }
+
+    public static String getTargetSipIP(Context context) {
+        return getSP(context).getString(KEY_SP_TARGET_SIP_IP, "");
+    }
+
+    public static void setTargetSipIP(Context context, String value) {
+        getEditor(context).putString(KEY_SP_TARGET_SIP_IP, value).apply();
+    }
+
 
 
     private static SharedPreferences getSP(Context context) {

+ 9 - 9
middleware/src/main/res/layout/extension_sip_dialog.xml

@@ -7,8 +7,8 @@
 
     <LinearLayout
         android:id="@+id/ll_sip_view"
-        android:layout_width="481dp"
-        android:layout_height="441dp"
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
         android:background="@color/color_white"
         android:gravity="center"
         android:orientation="vertical">
@@ -16,7 +16,7 @@
         <ImageView
             android:layout_width="88dp"
             android:layout_height="88dp"
-            android:layout_marginTop="42dp"
+            android:layout_marginTop="20dp"
             android:src="@drawable/hedimg" />
 
         <TextView
@@ -24,14 +24,14 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:gravity="center"
-            android:text="请设置SIP账号"
+            android:text="SIP账号设置"
             android:textColor="@color/black"
             android:textSize="22sp"
             android:textStyle="bold" />
 
         <EditText
             android:id="@+id/sip_id_ed"
-            android:layout_width="380dp"
+            android:layout_width="300dp"
             android:layout_height="48dp"
             android:layout_marginTop="20dp"
             android:background="@drawable/shape_n_login_ed_bg2"
@@ -44,7 +44,7 @@
 
         <EditText
             android:id="@+id/sip_ip_ed"
-            android:layout_width="380dp"
+            android:layout_width="300dp"
             android:layout_height="48dp"
             android:layout_marginTop="20dp"
             android:background="@drawable/shape_n_login_ed_bg2"
@@ -56,7 +56,7 @@
             android:textStyle="bold" />
 
         <LinearLayout
-            android:layout_width="400dp"
+            android:layout_width="wrap_content"
             android:layout_height="52dp"
             android:layout_marginTop="30dp"
             android:layout_marginBottom="80dp"
@@ -65,7 +65,7 @@
 
             <Button
                 android:id="@+id/confirm_button"
-                android:layout_width="180dp"
+                android:layout_width="120dp"
                 android:layout_height="48dp"
                 android:background="@drawable/shape_main_hos_txt_bg"
                 android:gravity="center"
@@ -75,7 +75,7 @@
 
             <Button
                 android:id="@+id/cancel_button"
-                android:layout_width="180dp"
+                android:layout_width="120dp"
                 android:layout_height="48dp"
                 android:layout_marginLeft="30dp"
                 android:background="@drawable/shape_main_hos_txt_bg"

+ 8 - 8
middleware/src/main/res/layout/password_check_dialog.xml

@@ -7,8 +7,8 @@
 
     <LinearLayout
         android:id="@+id/ll_password_view"
-        android:layout_width="480dp"
-        android:layout_height="440dp"
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
         android:background="@color/color_white"
         android:gravity="center"
         android:orientation="vertical">
@@ -16,7 +16,7 @@
         <ImageView
             android:layout_width="88dp"
             android:layout_height="88dp"
-            android:layout_marginTop="42dp"
+            android:layout_marginTop="20dp"
             android:src="@drawable/hedimg" />
 
         <TextView
@@ -32,7 +32,7 @@
 
         <EditText
             android:id="@+id/password_ed"
-            android:layout_width="380dp"
+            android:layout_width="300dp"
             android:layout_height="48dp"
             android:layout_marginTop="20dp"
             android:background="@drawable/shape_n_login_ed_bg2"
@@ -44,16 +44,16 @@
             android:textStyle="bold" />
 
         <LinearLayout
-            android:layout_width="400dp"
+            android:layout_width="wrap_content"
             android:layout_height="52dp"
             android:layout_marginTop="30dp"
-            android:layout_marginBottom="80dp"
+            android:layout_marginBottom="40dp"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <Button
                 android:id="@+id/password_cancel_button"
-                android:layout_width="180dp"
+                android:layout_width="120dp"
                 android:layout_height="48dp"
                 android:background="@drawable/shape_main_hos_txt_bg"
                 android:gravity="center"
@@ -63,7 +63,7 @@
 
             <Button
                 android:id="@+id/password_determine_button"
-                android:layout_width="180dp"
+                android:layout_width="120dp"
                 android:layout_height="48dp"
                 android:layout_marginLeft="30dp"
                 android:background="@drawable/shape_main_hos_txt_bg"

+ 8 - 8
middleware/src/main/res/layout/sip_dialog.xml

@@ -7,8 +7,8 @@
 
     <LinearLayout
         android:id="@+id/ll_sip_config_view"
-        android:layout_width="481dp"
-        android:layout_height="441dp"
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
         android:background="@color/color_white"
         android:gravity="center"
         android:orientation="vertical">
@@ -16,7 +16,7 @@
         <ImageView
             android:layout_width="88dp"
             android:layout_height="88dp"
-            android:layout_marginTop="42dp"
+            android:layout_marginTop="20dp"
             android:src="@drawable/hedimg" />
 
         <TextView
@@ -32,7 +32,7 @@
 
         <EditText
             android:id="@+id/sip_ed"
-            android:layout_width="380dp"
+            android:layout_width="300dp"
             android:layout_height="48dp"
             android:layout_marginTop="20dp"
             android:background="@drawable/shape_n_login_ed_bg2"
@@ -44,16 +44,16 @@
             android:textStyle="bold" />
 
         <LinearLayout
-            android:layout_width="400dp"
+            android:layout_width="wrap_content"
             android:layout_height="52dp"
             android:layout_marginTop="30dp"
-            android:layout_marginBottom="80dp"
+            android:layout_marginBottom="40dp"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <Button
                 android:id="@+id/sip_determine_button"
-                android:layout_width="180dp"
+                android:layout_width="120dp"
                 android:layout_height="48dp"
                 android:background="@drawable/shape_main_hos_txt_bg"
                 android:gravity="center"
@@ -63,7 +63,7 @@
 
             <Button
                 android:id="@+id/sip_cancel_button"
-                android:layout_width="180dp"
+                android:layout_width="120dp"
                 android:layout_height="48dp"
                 android:layout_marginLeft="30dp"
                 android:background="@drawable/shape_main_hos_txt_bg"

BIN
resource/src/main/res/drawable/av_mute.png


BIN
resource/src/main/res/drawable/av_mute_hover.png


+ 5 - 0
resource/src/main/res/drawable/av_mute_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/av_mute_hover" android:state_selected="true" />
+    <item android:drawable="@drawable/av_mute" />
+</selector>

+ 5 - 0
resource/src/main/res/drawable/av_speaker_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_speaker_off" android:state_selected="true" />
+    <item android:drawable="@drawable/ic_speaker_on" />
+</selector>

+ 0 - 0
resource/src/main/res/drawable/ic_speaker_off.xml


Some files were not shown because too many files changed in this diff