diff --git a/app/src/main/java/com/example/defenseapplication/adapter/AddDeviceAdapter.kt b/app/src/main/java/com/example/defenseapplication/adapter/AddDeviceAdapter.kt
index e8637be..463847f 100644
--- a/app/src/main/java/com/example/defenseapplication/adapter/AddDeviceAdapter.kt
+++ b/app/src/main/java/com/example/defenseapplication/adapter/AddDeviceAdapter.kt
@@ -47,7 +47,7 @@ class AddDeviceAdapter(
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val device = devices[position]
holder.tvName.text = device.name
- holder.ivIcon.setImageResource(R.drawable.img)
+ holder.ivIcon.setImageResource(R.mipmap.img)
// 点击事件
holder.itemView.setOnClickListener { onItemClick(device) }
diff --git a/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt b/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt
index ed3d0c3..fdc900e 100644
--- a/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt
+++ b/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt
@@ -49,7 +49,7 @@ class PersonalFragment : Fragment() {
.titleBar(binding.headerLayout)
.init()
Glide.with(this)
- .load(R.drawable.img)
+ .load(R.mipmap.img)
.circleCrop()
.into(binding.ivAvatar)
binding.headerLayout.setOnClickListener {
@@ -243,8 +243,8 @@ class PersonalFragment : Fragment() {
}
userInfo.avatar?.let {
val requestOptions = RequestOptions()
- .placeholder(R.drawable.img) // 加载中显示
- .error(R.drawable.img) // 失败时显示
+ .placeholder(R.mipmap.img) // 加载中显示
+ .error(R.mipmap.img) // 失败时显示
Glide.with(this)
.load(it) // 如果 avatar 为 null，Glide 会直接回调 error
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 9a3ff95..2c16f0a 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt
@@ -77,8 +77,8 @@ class AlarmLogActivity : AppCompatActivity() {
.setLockLand(false)
.setShowFullAnimation(true)
.setNeedShowWifiTip(false)
- .setEnlargeImageRes(R.drawable.full_size)
- .setShrinkImageRes(R.drawable.full_screen)
+ .setEnlargeImageRes(R.mipmap.full_size)
+ .setShrinkImageRes(R.mipmap.full_screen)
.setBottomShowProgressBarDrawable(progressDrawable, thumbDrawable)
.setVideoAllCallBack(object : GSYSampleCallBack() {
override fun onPrepared(url: String?, vararg objects: Any?) {
@@ -230,12 +230,12 @@ class AlarmLogActivity : AppCompatActivity() {
if (isMute) {
audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, 0, 0)
binding.ivMute.setImageResource(
- R.drawable.mute
+ R.mipmap.mute
)
} else {
audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC) / 2, 0)
binding.ivMute.setImageResource(
- R.drawable.un_mute
+ R.mipmap.un_mute
)
}
}
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 a6d6c25..31212f3 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt
@@ -198,9 +198,9 @@ class LiveVideoActivity : BaseActivity() {
isLightOn = !isLightOn
if (isLightOn) {
- binding.ivLight.setImageResource(com.example.defenseapplication.R.drawable.light_on_open)
+ binding.ivLight.setImageResource(com.example.defenseapplication.R.mipmap.light_on_open)
} else {
- binding.ivLight.setImageResource(com.example.defenseapplication.R.drawable.light_on)
+ binding.ivLight.setImageResource(com.example.defenseapplication.R.mipmap.light_on)
}
}
diff --git a/app/src/main/java/com/example/defenseapplication/view/ToastUtils.kt b/app/src/main/java/com/example/defenseapplication/view/ToastUtils.kt
index 8cee0a7..11ae826 100644
--- a/app/src/main/java/com/example/defenseapplication/view/ToastUtils.kt
+++ b/app/src/main/java/com/example/defenseapplication/view/ToastUtils.kt
@@ -47,9 +47,9 @@ object ToastUtils {
// 设置图标和文字
if (isSuccess) {
- ivIcon.setImageResource(R.drawable.fill) // 成功图标
+ ivIcon.setImageResource(R.mipmap.fill) // 成功图标
} else {
- ivIcon.setImageResource(R.drawable.error_circle) // 失败图标
+ ivIcon.setImageResource(R.mipmap.error_circle) // 失败图标
}
tvMessage.text = message
diff --git a/app/src/main/res/drawable/device_frame_animation.xml b/app/src/main/res/drawable/device_frame_animation.xml
index 575887c..8cbf50a 100644
--- a/app/src/main/res/drawable/device_frame_animation.xml
+++ b/app/src/main/res/drawable/device_frame_animation.xml
@@ -1,7 +1,7 @@
-