<增加设备id显示等>

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

@@ -16,6 +16,9 @@ class Constants {
         var app_path: String =""//apk下载路径
         var tcp_connected: Boolean = false
 
+        //当前是否为白天
+        var inday: Boolean = true
+
         //设备类型
         var DEVICE_TYPE: Int = 1
         /**

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

@@ -158,6 +158,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
             Log.e(TAG, Constants.hospital_name+ Constants.part_name)
         }
 
+        tv_device_id.text = "设备ID: " + Constants.ids
         home_radio_bt.isChecked = true
 
         // 添加登录回调
@@ -168,8 +169,8 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         setSettingConfiguration()
 
         initCountDownTimer()
-
         updateNetState()
+        updateTime()
 
         SpeechUtil.getInstance().init(this)
     }
@@ -554,40 +555,8 @@ fun call(tyte:Int){
             if (intent.action == Intent.ACTION_TIME_TICK
                     || intent.action == Intent.ACTION_TIME_CHANGED
                     || intent.action == Intent.ACTION_TIMEZONE_CHANGED) {
-                time_tv.text = TimeTransition().getDateTime("yyyy-MM-dd HH:mm E")
-                //根据时间判断白昼进行相关的配置设置
-                var currentTime = TimeTransition().getDateTime("yyyy-MM-dd HH:mm:ss")
-                Log.e(TAG,"当前时间；"+currentTime)
-                //转时间戳
-                var  currentTimestamp = TimeTransition().dateToStamp(currentTime)
-                Log.e(TAG,"currentTimestamp "+currentTimestamp)
-
-                //白天起始时间戳
-                var date = TimeTransition().getDateTime("yyyy-MM-dd")
-//                Log.e(TAG,"当前年份日期："+date +" "+SettingConfig.getInitialDayTime(context)+":00")
-                var dayStartTimeStamp = TimeTransition().dateToStamp(date+" "+SettingConfig.getInitialDayTime(context)+":00")
-                //白天结束时间戳
-                var endOfDayTimeStamp = TimeTransition().dateToStamp(date+" "+SettingConfig.getEndOfDay(context)+":00")
-//                Log.e(TAG,"当前："+SettingConfig.getEndOfDay(context)+":00")
-
-                Log.e(TAG,"dayStartTimeStamp "+dayStartTimeStamp+" "+"endOfDayTimeStamp"+endOfDayTimeStamp)
-
-                //白天
-                if(dayStartTimeStamp<currentTimestamp && currentTimestamp<endOfDayTimeStamp){
-                    //设置白天亮度
-                    ScreenManagerUtil().setScreenBrightness(context,Math.ceil(2.54 * SettingConfig.getMainEngineDaytimeBrightness(context)).toInt())
-                    //设置白天系统音量和响铃音
-                    setTheSystemVolume(SettingConfig.getHostDaytimeVolume(context))
-                    day_night_state_imagev.setImageResource(R.drawable.ic_daylight)
-
-                }else{ //夜晚
-                    //设置晚上亮度
-                    ScreenManagerUtil().setScreenBrightness(context,Math.ceil(2.54 * SettingConfig.getHostNightBrightness(context)).toInt())
-                    //设置晚上系统音量和响铃音
-                    setTheSystemVolume(SettingConfig.getHostNightVolume(context))
-                    day_night_state_imagev.setImageResource(R.drawable.ic_night)
-                }
 
+                updateTime()
                 updateNetState()
                 updateTcpState()
 
@@ -678,6 +647,39 @@ fun call(tyte:Int){
         }
     }
 
+    private fun updateTime() {
+        time_tv.text = TimeTransition().getDateTime("yyyy-MM-dd HH:mm E")
+        //根据时间判断白昼进行相关的配置设置
+        var currentTime = TimeTransition().getDateTime("yyyy-MM-dd HH:mm:ss")
+        //转时间戳
+        var  currentTimestamp = TimeTransition().dateToStamp(currentTime)
+
+        //白天起始时间戳
+        var date = TimeTransition().getDateTime("yyyy-MM-dd")
+        var dayStartTimeStamp = TimeTransition().dateToStamp(date+" "+SettingConfig.getInitialDayTime(this)+":00")
+        //白天结束时间戳
+        var endOfDayTimeStamp = TimeTransition().dateToStamp(date+" "+SettingConfig.getEndOfDay(this)+":00")
+
+        Log.e(TAG,"dayStartTimeStamp "+dayStartTimeStamp+" "+"endOfDayTimeStamp"+endOfDayTimeStamp)
+
+        //白天
+        if (dayStartTimeStamp < currentTimestamp && currentTimestamp < endOfDayTimeStamp) {
+            //设置白天亮度
+            ScreenManagerUtil().setScreenBrightness(this, Math.ceil(2.54 * SettingConfig.getMainEngineDaytimeBrightness(this)).toInt())
+            //设置白天系统音量和响铃音
+            setTheSystemVolume(SettingConfig.getHostDaytimeVolume(this))
+            day_night_state_imagev.setImageResource(R.drawable.ic_daylight)
+            Constants.inday = true
+        } else { //夜晚
+            //设置晚上亮度
+            ScreenManagerUtil().setScreenBrightness(this, Math.ceil(2.54 * SettingConfig.getHostNightBrightness(this)).toInt())
+            //设置晚上系统音量和响铃音
+            setTheSystemVolume(SettingConfig.getHostNightVolume(this))
+            day_night_state_imagev.setImageResource(R.drawable.ic_night)
+            Constants.inday = false
+        }
+    }
+
     private fun updateNetState() {
         if (NetHelper.getInstance().networkType == ConnectivityManager.TYPE_WIFI) {
             wifi_state_imagev.visibility = View.VISIBLE

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

@@ -99,7 +99,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
         tv_local_ip.text = "本机IP: " + ipAddr
         tv_local_mac.text = "本机MAC: " + macAddr
         tv_app_version.text = "APP版本: V" + BuildConfig.VERSION_NAME
-        tv_mcu_version.text = "MCU版本: " + Constants.MCU_VERSION_NUMBER
+        //tv_mcu_version.text = "MCU版本: " + Constants.MCU_VERSION_NUMBER
 
 
 

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

@@ -58,6 +58,14 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
+                        <TextView
+                            android:id="@+id/tv_device_id"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="20px"
+                            android:text="设备ID: --"
+                            android:textColor="#2F9DF1"
+                            android:textSize="14sp"/>
 
                         <!--   蓝牙状态  -->
                         <ImageView

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

@@ -50,7 +50,8 @@
             android:layout_marginTop="10dp"
             android:text="MCU:"
             android:textColor="@color/black"
-            android:textSize="20sp" />
+            android:textSize="20sp"
+            android:visibility="gone"/>
 
         <TextView
             android:id="@+id/feedback_device_info_tv"