From 04cf34dcfe11afe20c5381c74465de9b1fb1e674 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Sun, 25 Jun 2023 17:48:04 +0800 Subject: [PATCH] desc:lint --- .../player/VideoControllerView.java | 1 - .../com/yinuo/safetywatcher/watcher/App.kt | 2 +- .../watcher/base/BaseRvAdapter.kt | 1 + .../watcher/constant/TimeStep.kt | 2 +- .../safetywatcher/watcher/ui/HomeActivity.kt | 2 +- app/src/main/res/layout/activity_main.xml | 107 ------------------ app/src/main/res/layout/activity_uvc.xml | 68 ----------- .../widget/media/FileMediaDataSource.java | 2 - .../ijk/media/widget/media/IjkVideoView.java | 4 - library-ijkplayer/src/main/project.properties | 3 +- .../org/easydarwin/audio/AudioStream.java | 1 - .../java/org/easydarwin/hw/NV21Convertor.java | 1 - .../java/org/easydarwin/muxer/EasyMuxer.java | 4 - .../java/org/easydarwin/push/EasyPusher.java | 3 - .../main/java/org/easydarwin/util/Util.java | 3 - .../java/com/common/queue/BlockTaskQueue.java | 2 +- .../java/com/common/queue/TaskExecutor.java | 4 +- .../java/com/common/queue/TaskScheduler.java | 2 +- .../common/queue/{Task => task}/BaseTask.java | 2 +- .../common/queue/{Task => task}/DemoTask.java | 2 +- .../common/queue/{Task => task}/ITask.java | 2 +- .../queue/{Task => task}/TaskEvent.java | 2 +- .../queue/{Task => task}/TaskPriority.java | 2 +- .../java/com/common/serialport/SendMsgTask.kt | 2 +- .../library/vlc/encoder/AudioEncoderCore.java | 1 - 25 files changed, 15 insertions(+), 210 deletions(-) delete mode 100644 app/src/main/res/layout/activity_main.xml delete mode 100644 app/src/main/res/layout/activity_uvc.xml rename library-serialPort/src/main/java/com/common/queue/{Task => task}/BaseTask.java (99%) rename library-serialPort/src/main/java/com/common/queue/{Task => task}/DemoTask.java (97%) rename library-serialPort/src/main/java/com/common/queue/{Task => task}/ITask.java (97%) rename library-serialPort/src/main/java/com/common/queue/{Task => task}/TaskEvent.java (94%) rename library-serialPort/src/main/java/com/common/queue/{Task => task}/TaskPriority.java (84%) diff --git a/app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java b/app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java index 932677b..ba38942 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java +++ b/app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java @@ -13,7 +13,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageButton; -import android.widget.LinearLayout; import android.widget.MediaController; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt index 2b131ba..59efbad 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt @@ -59,6 +59,6 @@ class App : CommonApplication() { private suspend fun tryAssignment(warningDao: WarningDao, warning: Warning): Long { val latest = warningDao.findLatestByName(warning.gasName) - return if (latest?.endTime!! > 0L) latest?.endTime else System.currentTimeMillis() + return if (latest?.endTime!! > 0L) latest.endTime else System.currentTimeMillis() } } \ No newline at end of file diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseRvAdapter.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseRvAdapter.kt index 75c2203..422cdbe 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseRvAdapter.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseRvAdapter.kt @@ -6,6 +6,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ViewHolder import androidx.viewbinding.ViewBinding +@Suppress("PropertyName") abstract class BaseRvAdapter> : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/TimeStep.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/TimeStep.kt index 48bc0c2..ec99058 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/TimeStep.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/TimeStep.kt @@ -10,7 +10,7 @@ import androidx.annotation.IntDef TimeStep.MINUTE_5, ) -annotation class TimeStep() { +annotation class TimeStep { companion object { const val ILLEGAL_VALUE = -1 const val SECOND_30 = 30 diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt index 49ce14e..9fa7fca 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt @@ -107,7 +107,7 @@ class HomeActivity : NoOptionsActivity() { BatteryHelper.release(this@HomeActivity) WifiHelper.release(this@HomeActivity) SimHelper.release(this@HomeActivity) - mBinding?.root?.removeCallbacks(reStartCamera) + mBinding.root?.removeCallbacks(reStartCamera) mRender?.onDestoryed() } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 388238b..0000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - -