diff --git a/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt index ced912f..90aa34e 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt @@ -9,7 +9,6 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.Locale /** * String扩展方法 @@ -52,13 +51,8 @@ } fun String.compressImage(context: Context, listener: OnImageCompressListener) { - Luban.with(context) - .load(this) - .ignoreBy(100) + Luban.with(context).load(this) .setTargetDir(context.createCompressImageDir().toString()) - .filter { - !(it.isBlank() || it.lowercase(Locale.getDefault()).endsWith(".gif")) - } .setCompressListener(object : OnCompressListener { override fun onStart() { diff --git a/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt index ced912f..90aa34e 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt @@ -9,7 +9,6 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.Locale /** * String扩展方法 @@ -52,13 +51,8 @@ } fun String.compressImage(context: Context, listener: OnImageCompressListener) { - Luban.with(context) - .load(this) - .ignoreBy(100) + Luban.with(context).load(this) .setTargetDir(context.createCompressImageDir().toString()) - .filter { - !(it.isBlank() || it.lowercase(Locale.getDefault()).endsWith(".gif")) - } .setCompressListener(object : OnCompressListener { override fun onStart() { 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 30cd60a..b5741e9 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 @@ -5,6 +5,7 @@ import android.os.Handler import android.os.Looper import android.util.Base64 +import android.util.Log import com.casic.br.operationsite.test.util.CurrentScene import com.casic.br.operationsite.test.util.LocaleConstant import com.casic.br.operationsite.test.util.RuntimeCache @@ -111,7 +112,9 @@ 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" + val imageName = "IMG_${timeFormat.format(Date())}_${(0..300).random()}.jpg" + Log.d(kTag, "imageName: $imageName") + val imagePath = "/${context.createImageFileDir()}/$imageName" bitmap.saveImage(imagePath) when (RuntimeCache.currentScene) { diff --git a/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt index ced912f..90aa34e 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt @@ -9,7 +9,6 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.Locale /** * String扩展方法 @@ -52,13 +51,8 @@ } fun String.compressImage(context: Context, listener: OnImageCompressListener) { - Luban.with(context) - .load(this) - .ignoreBy(100) + Luban.with(context).load(this) .setTargetDir(context.createCompressImageDir().toString()) - .filter { - !(it.isBlank() || it.lowercase(Locale.getDefault()).endsWith(".gif")) - } .setCompressListener(object : OnCompressListener { override fun onStart() { 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 30cd60a..b5741e9 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 @@ -5,6 +5,7 @@ import android.os.Handler import android.os.Looper import android.util.Base64 +import android.util.Log import com.casic.br.operationsite.test.util.CurrentScene import com.casic.br.operationsite.test.util.LocaleConstant import com.casic.br.operationsite.test.util.RuntimeCache @@ -111,7 +112,9 @@ 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" + val imageName = "IMG_${timeFormat.format(Date())}_${(0..300).random()}.jpg" + Log.d(kTag, "imageName: $imageName") + val imagePath = "/${context.createImageFileDir()}/$imageName" bitmap.saveImage(imagePath) when (RuntimeCache.currentScene) { diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt index 43bbaa0..a68b34c 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt @@ -151,6 +151,7 @@ } binding.startVideoCheckButton.setOnClickListener { + RuntimeCache.currentScene = CurrentScene.Guardian constructionCheckViewModel.setCurrentPhase(LocaleConstant.AI_BASE_IP, "in_operation") } @@ -357,6 +358,5 @@ override fun onResume() { super.onResume() GSYVideoManager.onResume() - RuntimeCache.currentScene = CurrentScene.Guardian } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt index ced912f..90aa34e 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/extensions/String.kt @@ -9,7 +9,6 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.Locale /** * String扩展方法 @@ -52,13 +51,8 @@ } fun String.compressImage(context: Context, listener: OnImageCompressListener) { - Luban.with(context) - .load(this) - .ignoreBy(100) + Luban.with(context).load(this) .setTargetDir(context.createCompressImageDir().toString()) - .filter { - !(it.isBlank() || it.lowercase(Locale.getDefault()).endsWith(".gif")) - } .setCompressListener(object : OnCompressListener { override fun onStart() { 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 30cd60a..b5741e9 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 @@ -5,6 +5,7 @@ import android.os.Handler import android.os.Looper import android.util.Base64 +import android.util.Log import com.casic.br.operationsite.test.util.CurrentScene import com.casic.br.operationsite.test.util.LocaleConstant import com.casic.br.operationsite.test.util.RuntimeCache @@ -111,7 +112,9 @@ 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" + val imageName = "IMG_${timeFormat.format(Date())}_${(0..300).random()}.jpg" + Log.d(kTag, "imageName: $imageName") + val imagePath = "/${context.createImageFileDir()}/$imageName" bitmap.saveImage(imagePath) when (RuntimeCache.currentScene) { diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt index 43bbaa0..a68b34c 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt @@ -151,6 +151,7 @@ } binding.startVideoCheckButton.setOnClickListener { + RuntimeCache.currentScene = CurrentScene.Guardian constructionCheckViewModel.setCurrentPhase(LocaleConstant.AI_BASE_IP, "in_operation") } @@ -357,6 +358,5 @@ override fun onResume() { super.onResume() GSYVideoManager.onResume() - RuntimeCache.currentScene = CurrentScene.Guardian } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt index 7530f9d..08730e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt @@ -3,6 +3,7 @@ import android.os.Bundle import android.os.Handler import android.os.Message +import android.util.Log import android.view.View import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider @@ -138,6 +139,7 @@ private fun sendCommand() { lifecycleScope.launch(Dispatchers.IO) { + RuntimeCache.currentScene = CurrentScene.Supply constructionCheckViewModel.setCurrentPhase( LocaleConstant.AI_BASE_IP, "before_operation_protection" ) @@ -207,6 +209,7 @@ //自动上传到服务器 imagePath.compressImage(this, object : OnImageCompressListener { override fun onSuccess(file: File) { + Log.d(kTag, "absolutePath: ${file.absolutePath}") //上传图片 uploadFileViewModel.uploadImage(context, file) } @@ -245,6 +248,7 @@ private fun intentActivity() { sceneViewModel.notifyStageFinished(RuntimeCache.uploadFileTaskId, "Supply") + constructionCheckViewModel.setCurrentPhase(LocaleConstant.AI_BASE_IP, "Stop") SocketManager.get.send(LocaleConstant.START_VIDEO_COMMAND) navigatePageTo() } @@ -283,6 +287,5 @@ override fun onResume() { super.onResume() GSYVideoManager.onResume() - RuntimeCache.currentScene = CurrentScene.Supply } } \ No newline at end of file