desc:move package

app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import com.yinuo.safetywatcher.databinding.ActivityBaseBinding
-import com.yinuo.safetywatcher.watcher.view.CommonTopBar
+import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
 
 abstract class BaseActivity : AppCompatActivity() {
 

app/src/main/java/com/yinuo/safetywatcher/watcher/base/NoOptionsActivity.kt

@@ -1,7 +1,7 @@
 package com.yinuo.safetywatcher.watcher.base
 
 import android.view.View
-import com.yinuo.safetywatcher.watcher.view.CommonTopBar
+import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
 
 abstract class NoOptionsActivity : BaseActivity() {
     override fun getOptions(): List<CommonTopBar.Option>? {

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt

@@ -8,7 +8,7 @@ import com.yinuo.safetywatcher.player.ProVideoActivity
 import com.yinuo.safetywatcher.watcher.base.BaseActivity
 import com.yinuo.safetywatcher.watcher.utils.LztekUtil
 import com.yinuo.safetywatcher.watcher.utils.showToast
-import com.yinuo.safetywatcher.watcher.view.CommonTopBar
+import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
 
 
 class HistoryVideoActivity : BaseActivity() {

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt

@@ -7,14 +7,14 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityQueryDataBinding
-import com.yinuo.safetywatcher.watcher.adapter.HistoryDataAdapter
+import com.yinuo.safetywatcher.watcher.ui.adapter.HistoryDataAdapter
 import com.yinuo.safetywatcher.watcher.base.BaseActivity
 import com.yinuo.safetywatcher.watcher.constant.DEFAULT_QUERY_TIME_INTERVAL
 import com.yinuo.safetywatcher.watcher.constant.TimeStep
 import com.yinuo.safetywatcher.watcher.db.DBUtils
 import com.yinuo.safetywatcher.watcher.db.entity.Gas
 import com.yinuo.safetywatcher.watcher.utils.DateUtils
-import com.yinuo.safetywatcher.watcher.view.CommonTopBar
+import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorActivity.kt

@@ -4,7 +4,7 @@ import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivitySensorBinding
-import com.yinuo.safetywatcher.watcher.adapter.SensorAdapter
+import com.yinuo.safetywatcher.watcher.ui.adapter.SensorAdapter
 import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
 import com.yinuo.safetywatcher.watcher.bean.SensorData
 

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt

@@ -5,12 +5,12 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityWarndataBinding
-import com.yinuo.safetywatcher.watcher.adapter.WarnDataAdapter
+import com.yinuo.safetywatcher.watcher.ui.adapter.WarnDataAdapter
 import com.yinuo.safetywatcher.watcher.base.BaseActivity
 import com.yinuo.safetywatcher.watcher.bean.WarnData
 import com.yinuo.safetywatcher.watcher.constant.DEFAULT_QUERY_TIME_INTERVAL
 import com.yinuo.safetywatcher.watcher.utils.DateUtils
-import com.yinuo.safetywatcher.watcher.view.CommonTopBar
+import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
 
 class WarnDataActivity : BaseActivity() {
 

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/HistoryDataAdapter.kt

@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher.adapter
+package com.yinuo.safetywatcher.watcher.ui.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/SensorAdapter.kt

@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher.adapter
+package com.yinuo.safetywatcher.watcher.ui.adapter
 
 import android.content.Intent
 import android.view.LayoutInflater

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/WarnDataAdapter.kt

@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher.adapter
+package com.yinuo.safetywatcher.watcher.ui.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt

@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher.view
+package com.yinuo.safetywatcher.watcher.ui.view
 
 import android.app.Activity
 import android.content.Context

app/src/main/res/layout/activity_base.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/_303852">
 
-    <com.yinuo.safetywatcher.watcher.view.CommonTopBar
+    <com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
         android:id="@+id/topBar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/_87dp"/>