diff --git a/app/src/main/java/com/casic/br/operationsite/test/util/websocket/WebSocketManager.kt b/app/src/main/java/com/casic/br/operationsite/test/util/websocket/WebSocketManager.kt index ddd0acd..30cd60a 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/util/websocket/WebSocketManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/util/websocket/WebSocketManager.kt @@ -101,34 +101,41 @@ val base64 = if (RuntimeCache.currentScene == CurrentScene.Guardian) { message.split(":")[1] } else { - message + if (message.startsWith("alarm")) { + "" + } else { + message + } } - val bitmapArray = Base64.decode(base64, Base64.DEFAULT) - val bitmap = BitmapFactory.decodeByteArray(bitmapArray, 0, bitmapArray.size) - val imagePath = "/${context.createImageFileDir()}/IMG${timeFormat.format(Date())}.jpg" - bitmap.saveImage(imagePath) - when (RuntimeCache.currentScene) { - CurrentScene.Supply -> { - val msg = SuppliesActivity.weakReferenceHandler.obtainMessage() - msg.what = LocaleConstant.WEBSOCKET_MESSAGE_CODE - msg.obj = imagePath - SuppliesActivity.weakReferenceHandler.sendMessage(msg) - } + if (base64 != "") { + val bitmapArray = Base64.decode(base64, Base64.DEFAULT) + val bitmap = BitmapFactory.decodeByteArray(bitmapArray, 0, bitmapArray.size) + val imagePath = "/${context.createImageFileDir()}/IMG${timeFormat.format(Date())}.jpg" + bitmap.saveImage(imagePath) - CurrentScene.Disclosure -> {} - CurrentScene.Environment -> {} + when (RuntimeCache.currentScene) { + CurrentScene.Supply -> { + val msg = SuppliesActivity.weakReferenceHandler.obtainMessage() + msg.what = LocaleConstant.WEBSOCKET_MESSAGE_CODE + msg.obj = imagePath + SuppliesActivity.weakReferenceHandler.sendMessage(msg) + } - CurrentScene.Guardian -> { - val msg = GuardiansActivity.weakReferenceHandler.obtainMessage() - msg.what = LocaleConstant.WEBSOCKET_MESSAGE_CODE - msg.obj = imagePath - GuardiansActivity.weakReferenceHandler.sendMessage(msg) - } + CurrentScene.Disclosure -> {} + CurrentScene.Environment -> {} - else -> { - CoroutineScope(Dispatchers.Main).launch { - "作业阶段错误,请注意流程".show(context) + CurrentScene.Guardian -> { + val msg = GuardiansActivity.weakReferenceHandler.obtainMessage() + msg.what = LocaleConstant.WEBSOCKET_MESSAGE_CODE + msg.obj = imagePath + GuardiansActivity.weakReferenceHandler.sendMessage(msg) + } + + else -> { + CoroutineScope(Dispatchers.Main).launch { + "作业阶段错误,请注意流程".show(context) + } } } }