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<T, B : ViewBinding, VH : BaseRvAdapter.BaseViewHolder<T, B>> :
     RecyclerView.Adapter<VH>() {
 
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.yinuo.safetywatcher.MainActivity">
-
-
-    <TextureView
-        android:id="@+id/texture_view"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintDimensionRatio="h,640:480"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <CheckBox
-        android:id="@+id/enable_265"
-        android:layout_width="wrap_content"
-
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:text="265格式编码"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/texture_view" />
-
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_gravity="bottom"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:stretchColumns="*"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/pushing_state"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toTopOf="@+id/pushing"
-            android:background="#66ffffff"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-        <TableRow>
-            <Button
-                android:id="@+id/pushing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="推送"
-                android:onClick="onPushing"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <Button
-                android:id="@+id/switching_camera"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onSwitchCamera"
-                android:text="切换"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-
-            <Button
-                android:id="@+id/uvc_camera"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onUVCCamera"
-                android:text="UVC"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-            <Button
-                android:id="@+id/pushing_desktop"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onPushScreen"
-                android:text="推送屏幕"
-                app:layout_constraintRight_toLeftOf="@+id/switching_camera"
-                app:layout_constraintTop_toTopOf="parent" />
-        </TableRow>
-
-        <TableRow>
-        <Button
-            android:id="@+id/press_record"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="按住录像"
-            android:onClick="OnSaveRecord"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <TextView
-            android:id="@+id/record_time"
-            style="@style/Base.TextAppearance.AppCompat.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="00:00"
-            android:textColor="#ff0000"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/texture_view" />
-        </TableRow>
-    </TableLayout>
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_uvc.xml b/app/src/main/res/layout/activity_uvc.xml
deleted file mode 100644
index 0f15274..0000000
--- a/app/src/main/res/layout/activity_uvc.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.yinuo.safetywatcher.UVCActivity">
-
-
-    <TextureView
-        android:id="@+id/texture_view"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintDimensionRatio="h,640:480"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <TextView
-            android:id="@+id/pushing_state"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="#66ffffff"
-            app:layout_constraintBottom_toTopOf="@+id/pushing"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/pushing"
-                android:onClick="onPush"
-                android:text="推送" />
-
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onRecord"
-                android:text="录像" />
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onQuit"
-                android:text="退出" />
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onBackground"
-                android:text="后台" />
-
-        </LinearLayout>
-    </TableLayout>
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/FileMediaDataSource.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/FileMediaDataSource.java
index fa38a7e..670a8a1 100644
--- a/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/FileMediaDataSource.java
+++ b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/FileMediaDataSource.java
@@ -18,8 +18,6 @@
 package tv.danmaku.ijk.media.widget.media;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
diff --git a/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java
index ccf67e5..46bfa79 100644
--- a/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java
+++ b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java
@@ -19,8 +19,6 @@ package tv.danmaku.ijk.media.widget.media;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.Resources;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -51,9 +49,7 @@ import tv.danmaku.ijk.media.player.IjkMediaPlayer;
 import tv.danmaku.ijk.media.player.IjkTimedText;
 import tv.danmaku.ijk.media.player.TextureMediaPlayer;
 import tv.danmaku.ijk.media.player.misc.IMediaDataSource;
-import tv.danmaku.ijk.media.player.misc.IMediaFormat;
 import tv.danmaku.ijk.media.player.misc.ITrackInfo;
-import tv.danmaku.ijk.media.player.misc.IjkMediaFormat;
 
 public class IjkVideoView extends FrameLayout implements MediaController.MediaPlayerControl {
     private String TAG = "IjkVideoView";
diff --git a/library-ijkplayer/src/main/project.properties b/library-ijkplayer/src/main/project.properties
index 362a0a3..11de2ca 100644
--- a/library-ijkplayer/src/main/project.properties
+++ b/library-ijkplayer/src/main/project.properties
@@ -11,5 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-22
-android.library=true
+
diff --git a/library-push/src/main/java/org/easydarwin/audio/AudioStream.java b/library-push/src/main/java/org/easydarwin/audio/AudioStream.java
index 6768971..de4c622 100644
--- a/library-push/src/main/java/org/easydarwin/audio/AudioStream.java
+++ b/library-push/src/main/java/org/easydarwin/audio/AudioStream.java
@@ -7,7 +7,6 @@ import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.media.MediaRecorder;
 import android.os.Process;
-import androidx.annotation.Nullable;
 import android.util.Log;
 
 import org.easydarwin.easypusher.BuildConfig;
diff --git a/library-push/src/main/java/org/easydarwin/hw/NV21Convertor.java b/library-push/src/main/java/org/easydarwin/hw/NV21Convertor.java
index 0290867..c509e65 100644
--- a/library-push/src/main/java/org/easydarwin/hw/NV21Convertor.java
+++ b/library-push/src/main/java/org/easydarwin/hw/NV21Convertor.java
@@ -23,7 +23,6 @@ package org.easydarwin.hw;
 import java.nio.ByteBuffer;
 
 import android.media.MediaCodecInfo;
-import android.util.Log;
 
 /**
  * Converts from NV21 to YUV420 semi planar or planar.
diff --git a/library-push/src/main/java/org/easydarwin/muxer/EasyMuxer.java b/library-push/src/main/java/org/easydarwin/muxer/EasyMuxer.java
index 686c867..74a9be3 100644
--- a/library-push/src/main/java/org/easydarwin/muxer/EasyMuxer.java
+++ b/library-push/src/main/java/org/easydarwin/muxer/EasyMuxer.java
@@ -7,11 +7,7 @@ import android.media.MediaMuxer;
 import android.os.Build;
 import android.util.Log;
 
-import org.easydarwin.bus.StartRecord;
-import org.easydarwin.bus.StopRecord;
 import org.easydarwin.easypusher.BuildConfig;
-import org.easydarwin.easypusher.EasyApplication;
-import org.easydarwin.push.EasyPusher;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/library-push/src/main/java/org/easydarwin/push/EasyPusher.java b/library-push/src/main/java/org/easydarwin/push/EasyPusher.java
index 5ac7669..60f4308 100644
--- a/library-push/src/main/java/org/easydarwin/push/EasyPusher.java
+++ b/library-push/src/main/java/org/easydarwin/push/EasyPusher.java
@@ -9,9 +9,6 @@ package org.easydarwin.push;
 import android.content.Context;
 import android.util.Log;
 
-import org.easydarwin.bus.StreamStat;
-import org.easydarwin.easypusher.BuildConfig;
-
 
 public class EasyPusher implements Pusher {
     private static String TAG = "EasyPusher";
diff --git a/library-push/src/main/java/org/easydarwin/util/Util.java b/library-push/src/main/java/org/easydarwin/util/Util.java
index 41f3728..285ef1e 100644
--- a/library-push/src/main/java/org/easydarwin/util/Util.java
+++ b/library-push/src/main/java/org/easydarwin/util/Util.java
@@ -10,7 +10,6 @@ package org.easydarwin.util;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.text.TextUtils;
-import android.util.Log;
 
 import org.easydarwin.config.Config;
 
@@ -19,9 +18,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * 类Util的实现描述：//TODO 类实现描述
diff --git a/library-serialPort/src/main/java/com/common/queue/BlockTaskQueue.java b/library-serialPort/src/main/java/com/common/queue/BlockTaskQueue.java
index 86d9fac..4f7f717 100644
--- a/library-serialPort/src/main/java/com/common/queue/BlockTaskQueue.java
+++ b/library-serialPort/src/main/java/com/common/queue/BlockTaskQueue.java
@@ -2,7 +2,7 @@ package com.common.queue;
 
 import android.util.Log;
 
-import com.common.queue.Task.ITask;
+import com.common.queue.task.ITask;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.PriorityBlockingQueue;
diff --git a/library-serialPort/src/main/java/com/common/queue/TaskExecutor.java b/library-serialPort/src/main/java/com/common/queue/TaskExecutor.java
index a0f73bd..c72ec0d 100644
--- a/library-serialPort/src/main/java/com/common/queue/TaskExecutor.java
+++ b/library-serialPort/src/main/java/com/common/queue/TaskExecutor.java
@@ -4,8 +4,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 
-import com.common.queue.Task.TaskEvent;
-import com.common.queue.Task.ITask;
+import com.common.queue.task.TaskEvent;
+import com.common.queue.task.ITask;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
diff --git a/library-serialPort/src/main/java/com/common/queue/TaskScheduler.java b/library-serialPort/src/main/java/com/common/queue/TaskScheduler.java
index e3f635b..08cef72 100644
--- a/library-serialPort/src/main/java/com/common/queue/TaskScheduler.java
+++ b/library-serialPort/src/main/java/com/common/queue/TaskScheduler.java
@@ -1,6 +1,6 @@
 package com.common.queue;
 
-import com.common.queue.Task.ITask;
+import com.common.queue.task.ITask;
 
 public class TaskScheduler {
     private final String TAG = "TaskScheduler";
diff --git a/library-serialPort/src/main/java/com/common/queue/Task/BaseTask.java b/library-serialPort/src/main/java/com/common/queue/task/BaseTask.java
similarity index 99%
rename from library-serialPort/src/main/java/com/common/queue/Task/BaseTask.java
rename to library-serialPort/src/main/java/com/common/queue/task/BaseTask.java
index a51783c..8ca158f 100644
--- a/library-serialPort/src/main/java/com/common/queue/Task/BaseTask.java
+++ b/library-serialPort/src/main/java/com/common/queue/task/BaseTask.java
@@ -1,4 +1,4 @@
-package com.common.queue.Task;
+package com.common.queue.task;
 
 import android.util.Log;
 
diff --git a/library-serialPort/src/main/java/com/common/queue/Task/DemoTask.java b/library-serialPort/src/main/java/com/common/queue/task/DemoTask.java
similarity index 97%
rename from library-serialPort/src/main/java/com/common/queue/Task/DemoTask.java
rename to library-serialPort/src/main/java/com/common/queue/task/DemoTask.java
index e972614..8142a62 100644
--- a/library-serialPort/src/main/java/com/common/queue/Task/DemoTask.java
+++ b/library-serialPort/src/main/java/com/common/queue/task/DemoTask.java
@@ -1,4 +1,4 @@
-package com.common.queue.Task;
+package com.common.queue.task;
 
 import android.util.Log;
 
diff --git a/library-serialPort/src/main/java/com/common/queue/Task/ITask.java b/library-serialPort/src/main/java/com/common/queue/task/ITask.java
similarity index 97%
rename from library-serialPort/src/main/java/com/common/queue/Task/ITask.java
rename to library-serialPort/src/main/java/com/common/queue/task/ITask.java
index f9e30ad..c0f52eb 100644
--- a/library-serialPort/src/main/java/com/common/queue/Task/ITask.java
+++ b/library-serialPort/src/main/java/com/common/queue/task/ITask.java
@@ -1,4 +1,4 @@
-package com.common.queue.Task;
+package com.common.queue.task;
 
 public interface ITask extends Comparable<ITask> {
 
diff --git a/library-serialPort/src/main/java/com/common/queue/Task/TaskEvent.java b/library-serialPort/src/main/java/com/common/queue/task/TaskEvent.java
similarity index 94%
rename from library-serialPort/src/main/java/com/common/queue/Task/TaskEvent.java
rename to library-serialPort/src/main/java/com/common/queue/task/TaskEvent.java
index 356fb30..c6583c1 100644
--- a/library-serialPort/src/main/java/com/common/queue/Task/TaskEvent.java
+++ b/library-serialPort/src/main/java/com/common/queue/task/TaskEvent.java
@@ -1,4 +1,4 @@
-package com.common.queue.Task;
+package com.common.queue.task;
 
 import java.lang.ref.WeakReference;
 
diff --git a/library-serialPort/src/main/java/com/common/queue/Task/TaskPriority.java b/library-serialPort/src/main/java/com/common/queue/task/TaskPriority.java
similarity index 84%
rename from library-serialPort/src/main/java/com/common/queue/Task/TaskPriority.java
rename to library-serialPort/src/main/java/com/common/queue/task/TaskPriority.java
index d435b95..a19b542 100644
--- a/library-serialPort/src/main/java/com/common/queue/Task/TaskPriority.java
+++ b/library-serialPort/src/main/java/com/common/queue/task/TaskPriority.java
@@ -1,4 +1,4 @@
-package com.common.queue.Task;
+package com.common.queue.task;
 
 // 优先级分为3种，如注释所示，他们的关系：LOW < DEFAULT < HIGH
 public enum TaskPriority {
diff --git a/library-serialPort/src/main/java/com/common/serialport/SendMsgTask.kt b/library-serialPort/src/main/java/com/common/serialport/SendMsgTask.kt
index f3392db..ad71f75 100644
--- a/library-serialPort/src/main/java/com/common/serialport/SendMsgTask.kt
+++ b/library-serialPort/src/main/java/com/common/serialport/SendMsgTask.kt
@@ -1,6 +1,6 @@
 package com.common.serialport
 
-import com.common.queue.Task.BaseTask
+import com.common.queue.task.BaseTask
 
 class SendMsgTask(private val byteArray: ByteArray, private val action: (ByteArray) -> Unit) :
     BaseTask() {
diff --git a/library-vlc/src/main/java/com/yinuo/library/vlc/encoder/AudioEncoderCore.java b/library-vlc/src/main/java/com/yinuo/library/vlc/encoder/AudioEncoderCore.java
index f517c86..91e9553 100644
--- a/library-vlc/src/main/java/com/yinuo/library/vlc/encoder/AudioEncoderCore.java
+++ b/library-vlc/src/main/java/com/yinuo/library/vlc/encoder/AudioEncoderCore.java
@@ -11,7 +11,6 @@ import android.util.Log;
 import android.view.Surface;
 
 import com.yinuo.library.vlc.PushHelper;
-import com.yinuo.library.vlc.TaskUtils;
 import com.yinuo.library.vlc.utils.LogUtils;
 
 import org.easydarwin.easypusher.BuildConfig;