修改设备未注册或者床位未入住时自动熄屏，修改toast使用

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

@@ -225,8 +225,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
 
         //亮屏
         AppUtil.wakeUp(activity)
-        //设置默认熄屏时间为1分钟
-        AppTool.Setting.setScreenOffTimeOut(applicationContext, Constant.SLEEP_MINUTE)
+        setScreenOffTime()
 
         checkServer()
 
@@ -306,18 +305,32 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
     private fun checkServerConnect() {
         val timerTask: TimerTask = object : TimerTask() {
             override fun run() {
-                if (Constant.TCP_CONNECTED) {
-                    serverConnectTimes = 0
-                } else {
-                    //设备有ip地址，但是tcp未连接，可能是服务器地址不对或者中途网络断开或者服务端异常
-                    if (!TextUtils.isEmpty(NetHelper.getInstance().localIP)) {
-                        serverConnectTimes++
+                try {
+                    checkNet()
+
+                    if (Constant.TCP_CONNECTED) {
+                        serverConnectTimes = 0
+                    } else {
+                        //设备有ip地址，但是tcp未连接，可能是服务器地址不对或者中途网络断开或者服务端异常
+                        if (!TextUtils.isEmpty(NetHelper.getInstance().localIP)) {
+                            serverConnectTimes++
+                        }
+                        Log.e(TAG, "check tcp server connect ===> serverConnectTimes=$serverConnectTimes")
+                        if (serverConnectTimes >= 10) {
+                            //tcp检测断开连接次数超过20则重启设备
+                            AppUpdateHelper.systemRestart()
+                        }
                     }
-                    Log.e(TAG, "check tcp server connect ===> serverConnectTimes=$serverConnectTimes")
-                    if (serverConnectTimes >= 20) {
-                        //tcp检测断开连接次数超过20则重启设备
-                        AppUpdateHelper.systemRestart()
+
+                    if (Constant.CUSTOM_ID == -1) {
+                        //床位未入住，设备休眠
+                        AppUtil.goToSleep(activity)
+                    } else if (Constant.NIGHT_BRIGHTNESS == 0 && Constant.day_state == 1 && !Constant.IS_RECORDING && skyCallFragment == null) {
+                        //当前为夜晚熄屏模式，设备休眠
+                        AppUtil.goToSleep(activity)
                     }
+                } catch (e: Exception) {
+                    //
                 }
             }
         }
@@ -960,7 +973,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
     private fun startTcp() {
         if (Constant.TCP_SERVER_URL != null && !tcpConnect) {
             tcpConnect = true
-            Thread(Runnable { TcpClient.getInstance().init(Constant.TCP_SERVER_URL, Constant.TCP_PORT, Constant.TCP_HEART_BEAT) }).start()
+            Thread {
+                TcpClient.getInstance().init(Constant.TCP_SERVER_URL, Constant.TCP_PORT, Constant.TCP_HEART_BEAT)
+            }.start()
         }
     }
 
@@ -1500,7 +1515,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
                     + ", net error count: " + count)
             if (!Constant.TCP_CONNECTED && TextUtils.isEmpty(NetHelper.getInstance().localIP)) {
                 netErrCount++
-                Log.e(TAG, "network error!!! ==> netErrCount: $netErrCount, reset count: $count")
+                Log.e("checkNet", "network error!!! ==> netErrCount: $netErrCount, reset count: $count")
             } else {
                 netErrCount = 0
                 if (count > 0) {
@@ -1528,7 +1543,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
                     //隔2个小时再重启
                     val time = System.currentTimeMillis()
                     val errTime = time - checkTime
-                    Log.e(TAG, "show net error dialog --> errTime = $errTime")
+                    Log.e("checkNet", "show net error dialog --> errTime = $errTime")
                     if (errTime >= 2*60*60*1000) {
                         checkTime = time
                         netOffReset()
@@ -1658,8 +1673,8 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
         }*/
 
 
-        if (Constant.day_state == 0) {
-            //白天亮屏
+        if (Constant.day_state == 0 && Constant.CUSTOM_ID != -1) {
+            //当前是白天且床位有入住才亮屏
             AppUtil.wakeUp(activity)
         }
 
@@ -1683,7 +1698,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
                     //还未连接tcp服务器
                     presenter.loadTcpServerHost()
                 }*/
-                checkNet()
+                //checkNet()
             } else if (intent.action == ConnectivityManager.CONNECTIVITY_ACTION) {
                 updateNetState()
             }
@@ -1701,9 +1716,15 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
             Log.d(TAG, "set screen off timeout: ${Constant.SLEEP_MINUTE}")
             AppTool.Setting.setScreenOffTimeOut(applicationContext, Constant.SLEEP_MINUTE)
         } else {
-            //屏幕常亮
-            Log.d(TAG, "keep screen on")
-            AppTool.Setting.setScreenOffTimeOut2(applicationContext, 2147483647)
+            if (Constant.CUSTOM_ID != -1) {
+                //有人入住，屏幕常亮
+                Log.d(TAG, "keep screen on")
+                AppTool.Setting.setScreenOffTimeOut2(applicationContext, 2147483647)
+            } else {
+                //无人入住，自动休眠
+                Log.d(TAG, "no customer, set screen off timeout: ${Constant.SLEEP_MINUTE}")
+                AppTool.Setting.setScreenOffTimeOut(applicationContext, Constant.SLEEP_MINUTE)
+            }
         }
     }
 }

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

@@ -156,8 +156,13 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainView2LayoutBinding>(
             tv_bed_name.setText(R.string.device_disable)
             tv_bed_name.setTextColor(resources.getColor(R.color.red_color))
         } else {
-            tv_bed_name.text = Constant.BED_NAME
-            tv_bed_name.setTextColor(resources.getColor(R.color.main_color))
+            if (TextUtils.isEmpty(Constant.BED_NAME)) {
+                tv_bed_name.setText(R.string.str_unregister)
+                tv_bed_name.setTextColor(resources.getColor(R.color.red_color))
+            } else {
+                tv_bed_name.text = Constant.BED_NAME
+                tv_bed_name.setTextColor(resources.getColor(R.color.main_color))
+            }
         }
 
         if (Constant.CUSTOM_ID != -1) {

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

@@ -4,6 +4,7 @@ import android.content.Intent
 import android.hardware.Camera
 import android.os.Build
 import android.provider.Settings
+import android.text.TextUtils
 import android.text.method.ScrollingMovementMethod
 import android.util.DisplayMetrics
 import android.view.SurfaceHolder
@@ -81,7 +82,14 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
             }
         }.start()
 
-        tv_bed.text = "Bed: " + Constant.BED_NAME
+        if (TextUtils.isEmpty(Constant.BED_NAME)) {
+            tv_bed.setText(R.string.str_unregister)
+            tv_bed.setTextColor(resources.getColor(R.color.red_color))
+        } else {
+            tv_bed.text = "Bed: " + Constant.BED_NAME
+            tv_bed.setTextColor(resources.getColor(R.color.black))
+        }
+
         //val macAddr = NetHelper.getInstance().macAddress
         val ipAddr = NetHelper.getInstance().localIP
         if (Constant.DEVICE_STATUS == 0) {

app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -9,6 +9,7 @@ import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.enation.javashop.net.engine.config.NetEngineConfig
 import com.enation.javashop.net.engine.plugin.exception.RestfulExceptionInterceptor
 import com.enation.javashop.utils.base.config.BaseConfig
+import com.hjq.toast.Toaster
 import com.wdkl.app.ncs.callingbed.helper.*
 import com.wdkl.app.ncs.callingbed.settings.SettingConfig
 import serialporttest.utils.SerialPortUtil
@@ -99,6 +100,8 @@ class Application : BaseApplication() {
             }
         }
 
+        // 初始化 Toast 框架
+        Toaster.init(this)
 
         //anr catcher
         //AnrFcExceptionUtil.getInstance(this).initFCException()

common/build.gradle

@@ -200,6 +200,9 @@ dependencies {
      */
     compile files('libs/chinese2py.jar')
 
+    //toast 框架
+    compile files('libs/Toaster-12.6.aar')
+
     /**
      * 二维码扫描
      */

common/src/main/code/com/wdkl/ncs/android/lib/utils/ExtendMethods.kt

@@ -31,6 +31,7 @@ import com.enation.javashop.net.engine.plugin.rxbus.RxBus
 import com.enation.javashop.utils.base.tool.CommonTool
 import com.enation.javashop.utils.base.tool.ScreenTool
 import com.enation.javashop.utils.logger.LoggerFactory
+import com.hjq.toast.Toaster
 import io.reactivex.disposables.Disposable
 import okhttp3.ResponseBody
 import org.json.JSONArray
@@ -84,7 +85,14 @@ fun showMessage(message: String) {
     if (message == ""){
         return
     }
-    val messageCallback = {
+
+    try {
+        Toaster.showShort(message)
+    } catch (ex: Exception) {
+        //
+    }
+
+    /*val messageCallback = {
         Toast.makeText(BaseApplication.appContext, message, Toast.LENGTH_SHORT).show()
     }
     try {
@@ -92,7 +100,7 @@ fun showMessage(message: String) {
     } catch (runtime: RuntimeException) {
         Looper.prepare()
         messageCallback.invoke()
-    }
+    }*/
 }
 
 fun showMessage(resId: Int) {

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

@@ -64,6 +64,7 @@
     <string name="default_nurse_config_name">Elemento de enfermera</string>
     <string name="str_empty">NULO</string>
     <string name="str_null">NULO</string>
+    <string name="str_unregister">Unregister</string>
     <string name="device_disable">Dispositivo deshabilitado</string>
     <string name="str_disable">Activar dispositivo</string>
     <string name="str_enable">Habilitado</string>

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

@@ -63,6 +63,7 @@
     <string name="default_nurse_config_name">Элемент медсестры</string>
     <string name="str_empty">НОЛЬ</string>
     <string name="str_null">НОЛЬ</string>
+    <string name="str_unregister">Unregister</string>
     <string name="device_disable">Устройство отключено</string>
     <string name="str_disable">Включить устройство</string>
     <string name="str_enable">Включено</string>

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

@@ -64,6 +64,7 @@
     <string name="default_nurse_config_name">护理</string>
     <string name="str_empty">暂无</string>
     <string name="str_null">未知</string>
+    <string name="str_unregister">未注册</string>
     <string name="device_disable">设备未启用</string>
     <string name="str_disable">未启用</string>
     <string name="str_enable">已启用</string>

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

@@ -64,6 +64,7 @@
     <string name="default_nurse_config_name">Nursing</string>
     <string name="str_empty">NULL</string>
     <string name="str_null">NULL</string>
+    <string name="str_unregister">Unregister</string>
     <string name="device_disable">Device disabled</string>
     <string name="str_disable">Device enable</string>
     <string name="str_enable">Enabled</string>