From eda19438ac51771f8cb526fd9e5d04bb737e1cea Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Mon, 26 Jun 2023 09:38:08 +0800
Subject: [PATCH] desc:lint
---
app/src/main/AndroidManifest.xml | 20 -------------------
.../yinuo/safetywatcher/watcher/utils/Exts.kt | 3 +--
app/src/main/res/layout/activity_main_pro.xml | 1 -
3 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9305d16..d36741c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -111,26 +111,6 @@
android:screenOrientation="landscape"
android:exported="false"
android:theme="@style/FullscreenTheme" />
-
- <activity
- android:name=".MainActivity"
- android:exported="false"
- android:launchMode="singleInstance" />
- <activity
- android:name=".UVCActivity"
- android:exported="false"
- android:launchMode="singleInstance">
- <intent-filter>
- <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
- </intent-filter>
-
- <meta-data
- android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
- android:resource="@xml/device_filter" />
- </activity>
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/Exts.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/Exts.kt
index 64e45f6..14fc78c 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/Exts.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/Exts.kt
@@ -1,6 +1,5 @@
package com.yinuo.safetywatcher.watcher.utils
-import android.R
import android.content.Context
import android.graphics.drawable.StateListDrawable
import android.view.View
@@ -12,7 +11,7 @@ fun Context.showToast(msg: String) {
CommonToast(this).makeCommonText(this, msg, Toast.LENGTH_SHORT).show()
}
-private val focusableStateKey: IntArray = intArrayOf(R.attr.state_focused)
+private val focusableStateKey: IntArray = intArrayOf(android.R.attr.state_focused)
fun View?.trySetCommonBg() {
this?.apply {
val bg = StateListDrawable()
diff --git a/app/src/main/res/layout/activity_main_pro.xml b/app/src/main/res/layout/activity_main_pro.xml
index 8664892..c4ec8c9 100644
--- a/app/src/main/res/layout/activity_main_pro.xml
+++ b/app/src/main/res/layout/activity_main_pro.xml
@@ -40,7 +40,6 @@
android:layout_margin="3dp"
android:clickable="true"
android:gravity="center"
- android:onClick="onTakePictureThumbClicked"
android:padding="3dp"
android:scaleType="centerCrop"
android:visibility="invisible" />