益阳妇幼需求

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

@@ -175,6 +175,11 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             Constant.DEVICE_REGISTER_ID = Constant.LOCAL_MAC
         }
 
+        //益阳妇幼去掉部分菜单
+        room_action_call_bed.visibility = View.GONE
+        room_action_call.visibility = View.GONE
+        room_action_language_set.visibility = View.GONE
+
         //注册广播
         regReceiver()
         RecordHelper.getInstance().init()
@@ -898,13 +903,14 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             }
 
             //按钮名称显示
-            if (!TextUtils.isEmpty(partSetting.doorNurseTitle)) {
+            //益阳妇幼去掉呼叫护士功能
+            /*if (!TextUtils.isEmpty(partSetting.doorNurseTitle)) {
                 room_action_call.visibility = View.VISIBLE
                 room_action_call.text = partSetting.doorNurseTitle
             }
             if (partSetting.doorNurseValid != null && partSetting.doorNurseValid == 0) {
                 room_action_call.visibility = View.GONE
-            }
+            }*/
 
             if (!TextUtils.isEmpty(partSetting.doorNursingTitle)) {
                 room_action_nurse.visibility = View.VISIBLE
@@ -915,13 +921,14 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 room_action_nurse.visibility = View.GONE
             }
 
-            if (partSetting.roomCallBed != null && partSetting.roomCallBed == 0) {
+            //益阳妇幼去掉呼叫床位功能
+            /*if (partSetting.roomCallBed != null && partSetting.roomCallBed == 0) {
                 room_action_call_bed.visibility = View.GONE
                 //room_cancel_call.visibility = View.GONE
             } else {
                 room_action_call_bed.visibility = View.VISIBLE
                 //room_cancel_call.visibility = View.VISIBLE
-            }
+            }*/
 
             if (partSetting.boolDoorLightAlwaysOn != null && partSetting.boolDoorLightAlwaysOn == 1) {
                 SettingConfig.setDoorLightAlwaysOn(activity, 1)

middleware/src/main/code/com/wdkl/ncs/android/middleware/utils/CommonUtils.java

@@ -16,10 +16,11 @@ public class CommonUtils {
 
     //默认ip端口
     //private static final String DEFAULT_URL = "8.129.220.143";
-    private static final String DEFAULT_URL = "172.28.100.100";
+    //private static final String DEFAULT_URL = "172.28.100.100";
     //private static final String DEFAULT_URL = "192.168.9.200";
     //private static final String DEFAULT_URL = "192.168.8.5";
     //private static final String DEFAULT_URL = "192.168.101.1";  //潼南
+    private static final String DEFAULT_URL = "172.18.0.33";  //益阳妇幼
     private static final String DEFAULT_URL_PORT = "8006";
     private static final String DEFAULT_SIP_PORT = "8188";