医生主机版本初始化

app/build.gradle

@@ -32,7 +32,7 @@ android {
     aaptOptions.noCompress("mp3","wav", "apk")
 
     defaultConfig {
-        applicationId "com.wdkl.app.ncs.nursehost"
+        applicationId "com.wdkl.app.ncs.doctorhost"
         minSdkVersion min_sdk_version
         targetSdkVersion target_sdk_version
         versionCode app_version_code

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 19
+    ext.app_version_code = 1
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.4"
+    ext.app_version = "1.1.1"
 
     /**
      * 项目依赖库

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constants.kt

@@ -31,7 +31,7 @@ class Constants {
         var day_state = -1
 
         //设备类型
-        var DEVICE_TYPE: Int = 1
+        var DEVICE_TYPE: Int = 2
 
         /**
          * 注册设备出厂编号
@@ -56,7 +56,7 @@ class Constants {
         /**
          * 设备别名
          */
-        var DEVICE_NAME = "护士主机"
+        var DEVICE_NAME = "医生主机"
 
 
         //MCU版本

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

@@ -19,10 +19,10 @@ public class CommonUtils {
     private static final String KEY_SP_SIP_PORT = "KEY_SP_SIP_PORT";
 
     //默认服务器ip端口
-    //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 = "8.129.220.143";
     //private static final String DEFAULT_URL = "119.23.151.229";
-    private static final String DEFAULT_URL = "172.168.0.254";
+    //private static final String DEFAULT_URL = "172.168.0.254";
     private static final String DEFAULT_URL_PORT = "8006";
     private static final String DEFAULT_SIP_PORT = "8188";
 

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -837,7 +837,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         Log.e(TAG,"收到返回的设置配置信息 ")
         Log.e(TAG,"partId "+data.partId)
 
-        loadLedDevice()
+        //loadLedDevice()
 
         try {
             SettingConfiguration.getInstance().id  = data.id

nursehome/src/main/res/layout/activity_nurse_home.xml

@@ -278,7 +278,8 @@
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="点阵屏"
-                            android:textSize="24sp" />
+                            android:textSize="24sp"
+                            android:visibility="gone"/>
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/system_settings_radio_bt"

readme.md

@@ -30,12 +30,20 @@
 
 
 
+###################################################################################
+############################  卡尔主机或云派8寸机janus信令医生主机   ############
+###################################################################################
+
+
+
+
+
 
 
 
 ###################################################################################
-##########################  卡尔主机或云派8寸机janus信令版本   ##################
-###################################################################################
+###########################  卡尔主机或云派8寸机janus信令版本   ##################
+####################################################################################
 
 ## [1.1.2] version 17 - 2022-03-15
 - 切换janus信令

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="javashop_app_name">NCS-护士主机卡尔版</string>
+    <string name="javashop_app_name">NCS-医生主机卡尔版</string>
     <!--<string name="javashop_app_name">东坡区敬老院呼叫系统</string>-->
     <string name="javashop_qrcode_name">扫啊扫</string>
     <string name="javashop_navigation_home_title">首页</string>