From 5cda6d959ec9e8cea44451656ae9f58539540c3c Mon Sep 17 00:00:00 2001 From: maxinyu Date: Sat, 30 May 2026 17:36:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=BB=84=E4=BB=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .kotlin/errors/errors-1780047327329.log | 48 +++++++++++++++++++ .../liveVideo/AlarmLogActivity.kt | 14 ++++-- .../liveVideo/LiveVideoActivity.kt | 13 ++--- app/src/main/res/drawable/selector_down.xml | 5 ++ app/src/main/res/drawable/selector_left.xml | 5 ++ app/src/main/res/drawable/selector_right.xml | 5 ++ app/src/main/res/drawable/selector_up.xml | 5 ++ .../main/res/layout/alarm_log_activity.xml | 29 +++++++---- .../main/res/layout/live_video_activity.xml | 2 +- 9 files changed, 104 insertions(+), 22 deletions(-) create mode 100644 .kotlin/errors/errors-1780047327329.log create mode 100644 app/src/main/res/drawable/selector_down.xml create mode 100644 app/src/main/res/drawable/selector_left.xml create mode 100644 app/src/main/res/drawable/selector_right.xml create mode 100644 app/src/main/res/drawable/selector_up.xml diff --git a/.kotlin/errors/errors-1780047327329.log b/.kotlin/errors/errors-1780047327329.log new file mode 100644 index 0000000..fe17504 --- /dev/null +++ b/.kotlin/errors/errors-1780047327329.log @@ -0,0 +1,48 @@ +kotlin version: 2.2.10 +error message: java.nio.file.AccessDeniedException: C:\Users\Administrator\AppData\Local\kotlin\daemon\kotlin-daemon-client-tsmarker3301789471641137523.tmp + +error message: Daemon compilation failed: Could not connect to Kotlin compile daemon +java.lang.RuntimeException: Could not connect to Kotlin compile daemon + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:214) + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159) + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111) + at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:74) + at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:68) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:64) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:61) + at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:102) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:61) + at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44) + at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41) + at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:209) + at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204) + at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66) + at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59) + at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:166) + at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59) + at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53) + at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:58) + at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:176) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:317) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169) + at org.gradle.internal.Factories$1.create(Factories.java:30) + at org.gradle.internal.work.DefaultWorkerLeaseService.lambda$withLocksAcquired$0(DefaultWorkerLeaseService.java:269) + at org.gradle.internal.work.ResourceLockStatistics$1.measure(ResourceLockStatistics.java:42) + at org.gradle.internal.work.DefaultWorkerLeaseService.withLocksAcquired(DefaultWorkerLeaseService.java:267) + at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:259) + at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127) + at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:572) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:317) + at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64) + at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:47) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642) + at java.base/java.lang.Thread.run(Thread.java:1583) + + diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt index 9def8d5..ae28e5f 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt +++ b/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt @@ -53,7 +53,7 @@ class AlarmLogActivity : AppCompatActivity() { setContentView(binding.root) ImmersionBar.with(this) .statusBarDarkFont(true) - .titleBar(binding.exoPlayContextId) + .transparentStatusBar() .init() deviceId = intent.getStringExtra("device_id") @@ -128,11 +128,15 @@ class AlarmLogActivity : AppCompatActivity() { val playerView = findPlayerView(binding.exoPlayContextId) playerView?.setControllerVisibilityListener { visibility -> if (visibility == View.VISIBLE) { + binding.ivBack.visibility = View.VISIBLE binding.muteBar.visibility = View.VISIBLE - binding.functionBar.visibility = View.VISIBLE + binding.ivDownload.visibility = View.VISIBLE + binding.ivDelete.visibility = View.VISIBLE } else { + binding.ivBack.visibility = View.GONE binding.muteBar.visibility = View.GONE - binding.functionBar.visibility = View.GONE + binding.ivDownload.visibility = View.GONE + binding.ivDelete.visibility = View.GONE } } } @@ -255,6 +259,10 @@ class AlarmLogActivity : AppCompatActivity() { } private fun initListener() { + binding.ivBack.setOnClickListener { + finish() + } + binding.expandImg.setOnClickListener { showDatePicker() } diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt index 6040789..e29ccdc 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt +++ b/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt @@ -31,6 +31,7 @@ import androidx.activity.OnBackPressedCallback import chuangyuan.ycj.videolibrary.listener.VideoInfoListener import chuangyuan.ycj.videolibrary.video.VideoPlayerManager import android.view.View +import com.bumptech.glide.Glide class LiveVideoActivity : BaseActivity() { private lateinit var binding: LiveVideoActivityBinding @@ -291,11 +292,9 @@ class LiveVideoActivity : BaseActivity() { isVoiceEnabled = !isVoiceEnabled if (isVoiceEnabled) { - binding.ivVoice.setImageResource(com.example.defenseapplication.R.drawable.voice_on_open) - Toast.makeText(this, R.string.sound_on, Toast.LENGTH_SHORT).show() + Glide.with(this).asGif().load(com.example.defenseapplication.R.drawable.voice_on_open).into(binding.ivVoice) } else { binding.ivVoice.setImageResource(com.example.defenseapplication.R.drawable.voice) - Toast.makeText(this, R.string.sound_off, Toast.LENGTH_SHORT).show() } } @@ -304,10 +303,8 @@ class LiveVideoActivity : BaseActivity() { if (isLightOn) { binding.ivLight.setImageResource(com.example.defenseapplication.R.drawable.light_on_open) - Toast.makeText(this, R.string.light_on, Toast.LENGTH_SHORT).show() } else { binding.ivLight.setImageResource(com.example.defenseapplication.R.drawable.light_on) - Toast.makeText(this, R.string.light_off, Toast.LENGTH_SHORT).show() } } @@ -341,12 +338,10 @@ class LiveVideoActivity : BaseActivity() { binding.llAlarmLog.visibility = View.GONE binding.consoleBar.visibility = View.VISIBLE - binding.ivVoice.setImageResource(com.example.defenseapplication.R.drawable.voice_on_open) + Glide.with(this).asGif().load(com.example.defenseapplication.R.drawable.voice_on_open).into(binding.ivVoice) isVoiceEnabled = true startVoiceRecording() - - Toast.makeText(this, R.string.start_control_mode, Toast.LENGTH_SHORT).show() } private fun stopRecordingMode() { @@ -361,8 +356,6 @@ class LiveVideoActivity : BaseActivity() { stopVoiceRecording() stopMicPulseAnimation() - - Toast.makeText(this, R.string.stop_control_mode, Toast.LENGTH_SHORT).show() } private fun stopMicPulseAnimation() { diff --git a/app/src/main/res/drawable/selector_down.xml b/app/src/main/res/drawable/selector_down.xml new file mode 100644 index 0000000..34676d8 --- /dev/null +++ b/app/src/main/res/drawable/selector_down.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_left.xml b/app/src/main/res/drawable/selector_left.xml new file mode 100644 index 0000000..544ada1 --- /dev/null +++ b/app/src/main/res/drawable/selector_left.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_right.xml b/app/src/main/res/drawable/selector_right.xml new file mode 100644 index 0000000..edfb85b --- /dev/null +++ b/app/src/main/res/drawable/selector_right.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_up.xml b/app/src/main/res/drawable/selector_up.xml new file mode 100644 index 0000000..48d7dbd --- /dev/null +++ b/app/src/main/res/drawable/selector_up.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/alarm_log_activity.xml b/app/src/main/res/layout/alarm_log_activity.xml index f3b900d..4d69615 100644 --- a/app/src/main/res/layout/alarm_log_activity.xml +++ b/app/src/main/res/layout/alarm_log_activity.xml @@ -19,16 +19,29 @@ android:layout_height="280dp" android:background="@android:color/transparent" app:use_controller="true" /> - + + + android:layout_width="match_parent" + android:layout_height="44dp" + android:layout_gravity="top" + android:background="@android:color/transparent" + android:gravity="center_vertical" + android:visibility="visible"> + + + +